[PATCH] of: Move OF flags to be visible even when !CONFIG_OF

[PATCH] of: Move OF flags to be visible even when !CONFIG_OF

[Pantelis Antoniou]

We need those to be visible even when compiling with CONFIG_OF
disabled, since even the empty of_node_*_flag() method use the
flag.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
---
 include/linux/of.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/of.h b/include/linux/of.h
index 5f124f6..53d6bbdc 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -120,6 +120,12 @@ extern struct device_node *of_aliases;
 extern struct device_node *of_stdout;
 extern raw_spinlock_t devtree_lock;
 
+/* flag descriptions (need to be visible even when !CONFIG_OF) */
+#define OF_DYNAMIC	1 /* node and properties were allocated via kmalloc */
+#define OF_DETACHED	2 /* node has been detached from the device tree */
+#define OF_POPULATED	3 /* device already created for the node */
+#define OF_POPULATED_BUS	4 /* of_platform_populate recursed to children of this node */
+
 #ifdef CONFIG_OF
 static inline bool is_of_node(struct fwnode_handle *fwnode)
 {
@@ -217,12 +223,6 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))
 #endif
 
-/* flag descriptions */
-#define OF_DYNAMIC	1 /* node and properties were allocated via kmalloc */
-#define OF_DETACHED	2 /* node has been detached from the device tree */
-#define OF_POPULATED	3 /* device already created for the node */
-#define OF_POPULATED_BUS	4 /* of_platform_populate recursed to children of this node */
-
 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
 
-- 
1.7.12

Re: [PATCH] of: Move OF flags to be visible even when !CONFIG_OF

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

On Fri, Apr 24, 2015 at 12:41:56PM +0300, Pantelis Antoniou wrote:
> We need those to be visible even when compiling with CONFIG_OF
> disabled, since even the empty of_node_*_flag() method use the
> flag.
> 
> Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>

Acked-by: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>

You should have mentioned that this is needed to get a bugfix for
OF_DYNAMIC in i2c upstream!


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] of: Move OF flags to be visible even when !CONFIG_OF

[Rob Herring]

On Sun, Apr 26, 2015 at 7:45 AM, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> wrote:
> On Fri, Apr 24, 2015 at 12:41:56PM +0300, Pantelis Antoniou wrote:
>> We need those to be visible even when compiling with CONFIG_OF
>> disabled, since even the empty of_node_*_flag() method use the
>> flag.
>>
>> Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
>
> Acked-by: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>

Applied, thanks.

Rob

>
> You should have mentioned that this is needed to get a bugfix for
> OF_DYNAMIC in i2c upstream!
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html