gpiolib: more cleanups to get rid of of_node
Subsystems (5)
Andy Shevchenko
reviewerv2 cover gpiolib: more cleanups to get rid of of_node
One more user outside of GPIO library and pin control folders needs to be updated to use fwnode instead of of_node. To make this easier introduce a helper in property.h and convert the user.
Note, the helper will be useful not only for the current users, but any future ones that want to replace of_device_is_compatible() with analogous fwnode API.
Changelog v2:
- placed new helper correctly in the property.h
Andy Shevchenko (2):
device property: Introduce fwnode_device_is_compatible() helper
soc: fsl: qe: Switch to use fwnode instead of of_node
drivers/soc/fsl/qe/gpio.c | 4 +++- include/linux/property.h | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v2 1/2 device property: Introduce fwnode_device_is_compatible() helper
The fwnode_device_is_compatible() helper searches for the given string in the "compatible" string array property and, if found, returns true.
--- include/linux/property.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
include/linux/property.h +9 -1
@@ -55,7 +55,6 @@ int device_property_read_string(struct device *dev, const char *propname,int device_property_match_string (struct device *dev,const char *propname,const char *string); -bool fwnode_device_is_available (const struct fwnode_handle *fwnode);bool fwnode_property_present (const struct fwnode_handle *fwnode,const char *propname); int fwnode_property_read_u8_array(const struct fwnode_handle *fwnode,
@@ -77,6 +76,15 @@ int fwnode_property_read_string(const struct fwnode_handle *fwnode, const char *propname, const char **val);int fwnode_property_match_string (const struct fwnode_handle *fwnode,const char *propname,const char *string); + +bool fwnode_device_is_available (const struct fwnode_handle *fwnode); + +static inline +bool fwnode_device_is_compatible (const struct fwnode_handle *fwnode,const char *compat) +{ +return fwnode_property_match_string (fwnode,"compatible" , compat) >=0 ; +} + int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode, const char *prop, const char *nargs_prop, unsigned int nargs, unsigned int index,
Signature · 1 line
2.35.1
Re: [PATCH v2 1/2] device property: Introduce fwnode_device_is_compatible() helper
Hi Andy,
Quoted 22 lines · Andy Shevchenko
The
fwnode_device_is_compatible()helper searches for the given string in the "compatible" string array property and, if found, returns true.Signed-off-by Andy Shevchenko <[email protected]>--- include/linux/property.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)include/linux/property.h +0
-1@@ -55,7 +55,6 @@ int device_property_read_string(struct device *dev, const char *propname,int device_property_match_string (struct device *dev,const char *propname,const char *string); -bool fwnode_device_is_available (const struct fwnode_handle *fwnode);bool fwnode_property_present (const struct fwnode_handle *fwnode,const char *propname); int fwnode_property_read_u8_array(const struct fwnode_handle *fwnode,
include/linux/property.h int fwnode_property_read_string(const struct fwnode_handle *fwnode, · line 85
Quoted 10 lines
include/linux/property.h +7
-0@@ -77,6 +76,15 @@ int fwnode_property_read_string(const struct fwnode_handle *fwnode, const char *propname, const char **val);int fwnode_property_match_string (const struct fwnode_handle *fwnode,const char *propname,const char *string); + +bool fwnode_device_is_available (const struct fwnode_handle *fwnode); + +static inline +bool fwnode_device_is_compatible (const struct fwnode_handle *fwnode,const char *compat) +{ +return fwnode_property_match_string (fwnode,"compatible" , compat) >=0 ;
fwnode_property_match_string() returns zero on success, therefore >= 0 is not needed. I'd just use !fwnode_property_match_string(...).
For both patches:
Quoted 5 lines
include/linux/property.h +2
-0+} + int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode, const char *prop, const char *nargs_prop, unsigned int nargs, unsigned int index,
Signature · 3 lines
Regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 1/2] device property: Introduce fwnode_device_is_compatible() helper
Quoted 1 line · Sakari Ailus
On Wed, Oct 05, 2022 at 06:29:46PM +0300, Andy Shevchenko wrote:
...
Quoted 2 lines
fwnode_property_match_string()returns zero on success, therefore >= 0 is not needed. I'd just use !fwnode_property_match_string(...).
No, it's bug in the documentation, thanks to rising an attention, I forgot to send a fix for it earlier.
Quoted 3 lines
For both patches:
Reviewed-by Sakari Ailus <[email protected]>
Thanks, but as stated above the condition in my patch is correct. It seems due to documentation bug we have some kind of "buggy" code, luckily not too many to fix.
That said, I'm not going to resend this until PPC (Freescale) maintainers ask for it. Yang, what's your vision on this series?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerPATCH v2 2/2 soc: fsl: qe: Switch to use fwnode instead of of_node
In reply to Andy ShevchenkoThe OF node in the GPIO library is deprecated and soon will be removed.
GPIO library now accepts fwnode as a firmware node, so switch the driver to use it.
--- drivers/soc/fsl/qe/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/fsl/qe/gpio.c +3 -1
@@ -19,6 +19,8 @@#include <linux/gpio.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/property.h> +#include <soc/fsl/qe/qe.h> struct qe_gpio_chip {
@@ -179,7 +181,7 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index) goto err0; } -if (!of_device_is_compatible (gc->of_node,"fsl,mpc8323-qe-pario-bank" )) { +if (!fwnode_device_is_compatible (gc->fwnode,"fsl,mpc8323-qe-pario-bank" )) {pr_debug ("%s: tried to get a non-qe pin\n" , __func__); err = -EINVAL ; goto err0;
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerQuoted 10 lines · Andy Shevchenko
One more user outside of GPIO library and pin control folders needs to be updated to use fwnode instead of
of_node. To make this easier introduce a helper inproperty.hand convert the user.Note, the helper will be useful not only for the current users, but any future ones that want to replace
of_device_is_compatible()with analogous fwnode API.Changelog v2:
- placed new helper correctly in theproperty.h
Any comments on the series?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerQuoted 5 lines · Andy Shevchenko
Quoted 4 lines · Andy Shevchenko
One more user outside of GPIO library and pin control folders needs to be updated to use fwnode instead of
of_node. To make this easier introduce a helper inproperty.hand convert the user.
Quoted 8 lines
Quoted 6 lines
Note, the helper will be useful not only for the current users, but any future ones that want to replace
of_device_is_compatible()with analogous fwnode API.Changelog v2:
- placed new helper correctly in theproperty.hAny comments on the series?
I'm going to apply this to my branch with Sakari's tag since there is no answer from PPC maintainers for a month.
Signature · 2 lines
With Best Regards, Andy Shevchenko