[PATCH] of: Empty node & property flag accessors when !OF

[PATCH] of: Empty node & property flag accessors when !OF

[Pantelis Antoniou]

Introduce empty node and property flag accessors when CONFIG_OF is not
defined.
This allows us to use them without ifdef'ing them in places where it
makes sense to do so.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
---
 include/linux/of.h | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/include/linux/of.h b/include/linux/of.h
index dfde07e..7ede449 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -616,6 +616,38 @@ static inline const char *of_prop_next_string(struct property *prop,
 	return NULL;
 }
 
+static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
+{
+	return 0;
+}
+
+static inline int of_node_test_and_set_flag(struct device_node *n,
+					    unsigned long flag)
+{
+	return 0;
+}
+
+static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
+{
+}
+
+static inline void of_node_clear_flag(struct device_node *n, unsigned long flag)
+{
+}
+
+static inline int of_property_check_flag(struct property *p, unsigned long flag)
+{
+	return 0;
+}
+
+static inline void of_property_set_flag(struct property *p, unsigned long flag)
+{
+}
+
+static inline void of_property_clear_flag(struct property *p, unsigned long flag)
+{
+}
+
 #define of_match_ptr(_ptr)	NULL
 #define of_match_node(_matches, _node)	NULL
 #endif /* CONFIG_OF */
-- 
1.7.12

--
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

Re: [PATCH] of: Empty node & property flag accessors when !OF

[Rob Herring]

+Wolfram

On Wed, Jan 21, 2015 at 11:05 AM, Pantelis Antoniou
<pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org> wrote:
> Introduce empty node and property flag accessors when CONFIG_OF is not
> defined.
> This allows us to use them without ifdef'ing them in places where it
> makes sense to do so.
>
> Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

I've asked Wolfram to apply. While not a fix itself, this is needed
for an I2C related fix for 3.19.

Rob

> ---
>  include/linux/of.h | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/include/linux/of.h b/include/linux/of.h
> index dfde07e..7ede449 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -616,6 +616,38 @@ static inline const char *of_prop_next_string(struct property *prop,
>         return NULL;
>  }
>
> +static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
> +{
> +       return 0;
> +}
> +
> +static inline int of_node_test_and_set_flag(struct device_node *n,
> +                                           unsigned long flag)
> +{
> +       return 0;
> +}
> +
> +static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
> +{
> +}
> +
> +static inline void of_node_clear_flag(struct device_node *n, unsigned long flag)
> +{
> +}
> +
> +static inline int of_property_check_flag(struct property *p, unsigned long flag)
> +{
> +       return 0;
> +}
> +
> +static inline void of_property_set_flag(struct property *p, unsigned long flag)
> +{
> +}
> +
> +static inline void of_property_clear_flag(struct property *p, unsigned long flag)
> +{
> +}
> +
>  #define of_match_ptr(_ptr)     NULL
>  #define of_match_node(_matches, _node) NULL
>  #endif /* CONFIG_OF */
> --
> 1.7.12
>
--
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

Re: [PATCH] of: Empty node & property flag accessors when !OF

[Grant Likely]

On Thu, 22 Jan 2015 17:13:51 -0600
, Rob Herring <robherring2@gmail.com>
 wrote:
> +Wolfram
> 
> On Wed, Jan 21, 2015 at 11:05 AM, Pantelis Antoniou
> <pantelis.antoniou@konsulko.com> wrote:
> > Introduce empty node and property flag accessors when CONFIG_OF is not
> > defined.
> > This allows us to use them without ifdef'ing them in places where it
> > makes sense to do so.
> >
> > Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
> 
> Acked-by: Rob Herring <robh@kernel.org>
> 
> I've asked Wolfram to apply. While not a fix itself, this is needed
> for an I2C related fix for 3.19.

I don't see this in mainline or linux-next, so I've applied to my tree.
Thanks.

g.

> 
> Rob
> 
> > ---
> >  include/linux/of.h | 32 ++++++++++++++++++++++++++++++++
> >  1 file changed, 32 insertions(+)
> >
> > diff --git a/include/linux/of.h b/include/linux/of.h
> > index dfde07e..7ede449 100644
> > --- a/include/linux/of.h
> > +++ b/include/linux/of.h
> > @@ -616,6 +616,38 @@ static inline const char *of_prop_next_string(struct property *prop,
> >         return NULL;
> >  }
> >
> > +static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
> > +{
> > +       return 0;
> > +}
> > +
> > +static inline int of_node_test_and_set_flag(struct device_node *n,
> > +                                           unsigned long flag)
> > +{
> > +       return 0;
> > +}
> > +
> > +static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
> > +{
> > +}
> > +
> > +static inline void of_node_clear_flag(struct device_node *n, unsigned long flag)
> > +{
> > +}
> > +
> > +static inline int of_property_check_flag(struct property *p, unsigned long flag)
> > +{
> > +       return 0;
> > +}
> > +
> > +static inline void of_property_set_flag(struct property *p, unsigned long flag)
> > +{
> > +}
> > +
> > +static inline void of_property_clear_flag(struct property *p, unsigned long flag)
> > +{
> > +}
> > +
> >  #define of_match_ptr(_ptr)     NULL
> >  #define of_match_node(_matches, _node) NULL
> >  #endif /* CONFIG_OF */
> > --
> > 1.7.12
> >

Re: [PATCH] of: Empty node & property flag accessors when !OF

[Wolfram Sang]

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

On Fri, Mar 20, 2015 at 12:12:23PM +0000, Grant Likely wrote:
> On Thu, 22 Jan 2015 17:13:51 -0600
> , Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>  wrote:
> > +Wolfram
> > 
> > On Wed, Jan 21, 2015 at 11:05 AM, Pantelis Antoniou
> > <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org> wrote:
> > > Introduce empty node and property flag accessors when CONFIG_OF is not
> > > defined.
> > > This allows us to use them without ifdef'ing them in places where it
> > > makes sense to do so.
> > >
> > > Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
> > 
> > Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > 
> > I've asked Wolfram to apply. While not a fix itself, this is needed
> > for an I2C related fix for 3.19.
> 
> I don't see this in mainline or linux-next, so I've applied to my tree.
> Thanks.

Thanks! I didn't have the original patch and asked for a resend. That
never happened, so it slipped through.


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