dm: core: Drop the const from ofnode
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:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user