leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: Drop the const from ofnode

Browse Source 
Now that we support writing to ofnodes, the const is not accurate. Drop
it to avoid undesirable casting.

Also drop the ofnode_to_npw() which is now the same as ofnode_to_np().

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2022-09-06 20:27:04 -06:00
committed by Tom Rini
parent c3a194dec9
commit 9830698765
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/core/ofnode.c
View File

@@ -268,7 +268,7 @@ ofnode ofnode_find_subnode(ofnode node, const char *subnode_name)
debug("%s: %s: ", __func__, subnode_name);
if (ofnode_is_np(node)) {
const struct device_node *np = ofnode_to_np(node);
struct device_node *np = ofnode_to_np(node);
for (np = np->child; np; np = np->sibling) {
if (!strcmp(subnode_name, np->name))
@@ -1171,7 +1171,7 @@ int ofnode_write_prop(ofnode node, const char *propname, const void *value,
int len)
{
if (of_live_active())
return of_write_prop(ofnode_to_npw(node), propname, len, value);
return of_write_prop(ofnode_to_np(node), propname, len, value);
else
return fdt_setprop((void *)gd->fdt_blob, ofnode_to_offset(node),
propname, value, len);

22
include/dm/ofnode.h
View File

@@ -35,7 +35,7 @@ struct ofnode_phandle_args {
* @node: Reference containing struct device_node * (possibly invalid)
* Return: pointer to device node (can be NULL)
*/
static inline const struct device_node *ofnode_to_np(ofnode node)
static inline struct device_node *ofnode_to_np(ofnode node)
{
#ifdef OF_CHECKS
if (!of_live_active())
@@ -44,24 +44,6 @@ static inline const struct device_node *ofnode_to_np(ofnode node)
return node.np;
}
/**
* ofnode_to_npw() - convert an ofnode to a writeable live DT node pointer
*
* This cannot be called if the reference contains an offset.
*
* @node: Reference containing struct device_node * (possibly invalid)
* Return: pointer to device node (can be NULL)
*/
static inline struct device_node *ofnode_to_npw(ofnode node)
{
#ifdef OF_CHECKS
if (!of_live_active())
return NULL;
#endif
/* Drop constant */
return (struct device_node *)node.np;
}
/**
* ofnode_to_offset() - convert an ofnode to a flat DT offset
*
@@ -117,7 +99,7 @@ static inline ofnode offset_to_ofnode(int of_offset)
* @np: Live node pointer (can be NULL)
* Return: reference to the associated node pointer
*/
static inline ofnode np_to_ofnode(const struct device_node *np)
static inline ofnode np_to_ofnode(struct device_node *np)
{
ofnode node;

2
include/dm/ofnode_decl.h
View File

@@ -39,7 +39,7 @@
* is not a really a pointer to a node: it is an offset value. See above.
*/
typedef union ofnode_union {
const struct device_node *np;
struct device_node *np;
long of_offset;
} ofnode;