| Message ID | 20220927142822.4095-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/5] device property: Keep dev_fwnode() and dev_fwnode_const() separate | expand |
Hi Andy, Thanks for the set. On Tue, Sep 27, 2022 at 05:28:17PM +0300, Andy Shevchenko wrote: > It's not fully correct to take a const parameter pointer to a struct > and return a non-const pointer to a member of that struct. I guess you could go as far as saying it's not at all correct. :-) > > Instead, introduce a const version of the dev_fwnode() API which takes > and returns const pointers and use it where it's applicable. > > Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Fixes: aade55c86033 ("device property: Add const qualifier to device_get_match_data() parameter") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> For the set: Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
On Tue, Sep 27, 2022 at 05:28:17PM +0300, Andy Shevchenko wrote: > It's not fully correct to take a const parameter pointer to a struct > and return a non-const pointer to a member of that struct. > > Instead, introduce a const version of the dev_fwnode() API which takes > and returns const pointers and use it where it's applicable. > > Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Fixes: aade55c86033 ("device property: Add const qualifier to device_get_match_data() parameter") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> For the whole series: Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/base/property.c | 11 +++++++++-- > include/linux/property.h | 3 ++- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/base/property.c b/drivers/base/property.c > index 4d6278a84868..699f1b115e0a 100644 > --- a/drivers/base/property.c > +++ b/drivers/base/property.c > @@ -17,13 +17,20 @@ > #include <linux/property.h> > #include <linux/phy.h> > > -struct fwnode_handle *dev_fwnode(const struct device *dev) > +struct fwnode_handle *dev_fwnode(struct device *dev) > { > return IS_ENABLED(CONFIG_OF) && dev->of_node ? > of_fwnode_handle(dev->of_node) : dev->fwnode; > } > EXPORT_SYMBOL_GPL(dev_fwnode); > > +const struct fwnode_handle *dev_fwnode_const(const struct device *dev) > +{ > + return IS_ENABLED(CONFIG_OF) && dev->of_node ? > + of_fwnode_handle(dev->of_node) : dev->fwnode; > +} > +EXPORT_SYMBOL_GPL(dev_fwnode_const); > + > /** > * device_property_present - check if a property of a device is present > * @dev: Device whose property is being checked > @@ -1202,7 +1209,7 @@ EXPORT_SYMBOL(fwnode_graph_parse_endpoint); > > const void *device_get_match_data(const struct device *dev) > { > - return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); > + return fwnode_call_ptr_op(dev_fwnode_const(dev), device_get_match_data, dev); > } > EXPORT_SYMBOL_GPL(device_get_match_data); > > diff --git a/include/linux/property.h b/include/linux/property.h > index 117cc200c656..ae5d7f8eccf4 100644 > --- a/include/linux/property.h > +++ b/include/linux/property.h > @@ -32,7 +32,8 @@ enum dev_dma_attr { > DEV_DMA_COHERENT, > }; > > -struct fwnode_handle *dev_fwnode(const struct device *dev); > +struct fwnode_handle *dev_fwnode(struct device *dev); > +const struct fwnode_handle *dev_fwnode_const(const struct device *dev); > > bool device_property_present(struct device *dev, const char *propname); > int device_property_read_u8_array(struct device *dev, const char *propname, > -- > 2.35.1
On Wed, Sep 28, 2022 at 9:36 AM Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote: > > On Tue, Sep 27, 2022 at 05:28:17PM +0300, Andy Shevchenko wrote: > > It's not fully correct to take a const parameter pointer to a struct > > and return a non-const pointer to a member of that struct. > > > > Instead, introduce a const version of the dev_fwnode() API which takes > > and returns const pointers and use it where it's applicable. > > > > Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com> > > Fixes: aade55c86033 ("device property: Add const qualifier to device_get_match_data() parameter") > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > For the whole series: > > Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > > --- > > drivers/base/property.c | 11 +++++++++-- > > include/linux/property.h | 3 ++- > > 2 files changed, 11 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/base/property.c b/drivers/base/property.c > > index 4d6278a84868..699f1b115e0a 100644 > > --- a/drivers/base/property.c > > +++ b/drivers/base/property.c > > @@ -17,13 +17,20 @@ > > #include <linux/property.h> > > #include <linux/phy.h> > > > > -struct fwnode_handle *dev_fwnode(const struct device *dev) > > +struct fwnode_handle *dev_fwnode(struct device *dev) > > { > > return IS_ENABLED(CONFIG_OF) && dev->of_node ? > > of_fwnode_handle(dev->of_node) : dev->fwnode; > > } > > EXPORT_SYMBOL_GPL(dev_fwnode); > > > > +const struct fwnode_handle *dev_fwnode_const(const struct device *dev) > > +{ > > + return IS_ENABLED(CONFIG_OF) && dev->of_node ? > > + of_fwnode_handle(dev->of_node) : dev->fwnode; > > +} > > +EXPORT_SYMBOL_GPL(dev_fwnode_const); > > + > > /** > > * device_property_present - check if a property of a device is present > > * @dev: Device whose property is being checked > > @@ -1202,7 +1209,7 @@ EXPORT_SYMBOL(fwnode_graph_parse_endpoint); > > > > const void *device_get_match_data(const struct device *dev) > > { > > - return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); > > + return fwnode_call_ptr_op(dev_fwnode_const(dev), device_get_match_data, dev); > > } > > EXPORT_SYMBOL_GPL(device_get_match_data); > > > > diff --git a/include/linux/property.h b/include/linux/property.h > > index 117cc200c656..ae5d7f8eccf4 100644 > > --- a/include/linux/property.h > > +++ b/include/linux/property.h > > @@ -32,7 +32,8 @@ enum dev_dma_attr { > > DEV_DMA_COHERENT, > > }; > > > > -struct fwnode_handle *dev_fwnode(const struct device *dev); > > +struct fwnode_handle *dev_fwnode(struct device *dev); > > +const struct fwnode_handle *dev_fwnode_const(const struct device *dev); > > > > bool device_property_present(struct device *dev, const char *propname); > > int device_property_read_u8_array(struct device *dev, const char *propname, > > -- So I would like all of you to see the response from Greg to the v2 of this patch and provide your input in that thread: https://lore.kernel.org/linux-acpi/YzQqcFZtJn90URrJ@kroah.com/T/#u
diff --git a/drivers/base/property.c b/drivers/base/property.c index 4d6278a84868..699f1b115e0a 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -17,13 +17,20 @@ #include <linux/property.h> #include <linux/phy.h> -struct fwnode_handle *dev_fwnode(const struct device *dev) +struct fwnode_handle *dev_fwnode(struct device *dev) { return IS_ENABLED(CONFIG_OF) && dev->of_node ? of_fwnode_handle(dev->of_node) : dev->fwnode; } EXPORT_SYMBOL_GPL(dev_fwnode); +const struct fwnode_handle *dev_fwnode_const(const struct device *dev) +{ + return IS_ENABLED(CONFIG_OF) && dev->of_node ? + of_fwnode_handle(dev->of_node) : dev->fwnode; +} +EXPORT_SYMBOL_GPL(dev_fwnode_const); + /** * device_property_present - check if a property of a device is present * @dev: Device whose property is being checked @@ -1202,7 +1209,7 @@ EXPORT_SYMBOL(fwnode_graph_parse_endpoint); const void *device_get_match_data(const struct device *dev) { - return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); + return fwnode_call_ptr_op(dev_fwnode_const(dev), device_get_match_data, dev); } EXPORT_SYMBOL_GPL(device_get_match_data); diff --git a/include/linux/property.h b/include/linux/property.h index 117cc200c656..ae5d7f8eccf4 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -32,7 +32,8 @@ enum dev_dma_attr { DEV_DMA_COHERENT, }; -struct fwnode_handle *dev_fwnode(const struct device *dev); +struct fwnode_handle *dev_fwnode(struct device *dev); +const struct fwnode_handle *dev_fwnode_const(const struct device *dev); bool device_property_present(struct device *dev, const char *propname); int device_property_read_u8_array(struct device *dev, const char *propname,
It's not fully correct to take a const parameter pointer to a struct and return a non-const pointer to a member of that struct. Instead, introduce a const version of the dev_fwnode() API which takes and returns const pointers and use it where it's applicable. Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com> Fixes: aade55c86033 ("device property: Add const qualifier to device_get_match_data() parameter") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/base/property.c | 11 +++++++++-- include/linux/property.h | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-)