Re: [PATCH v1 1/1] device property: Add const qualifier to device_get_match_data() parameter
From: Sakari Ailus
Date: Thu Sep 22 2022 - 16:23:07 EST
Hi Andy,
Thanks for cc'ing me.
On Thu, Sep 22, 2022 at 04:54:10PM +0300, Andy Shevchenko wrote:
> Add const qualifier to the device_get_match_data() parameter.
> Some of the future users may utilize this function without
> forcing the type.
>From const to non-const? This is what this patch does, right?
>
> All the same, dev_fwnode() may be used with a const qualifier.
>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/base/property.c | 4 ++--
> include/linux/property.h | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index ed6f449f8e5c..4d6278a84868 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -17,7 +17,7 @@
> #include <linux/property.h>
> #include <linux/phy.h>
>
> -struct fwnode_handle *dev_fwnode(struct device *dev)
> +struct fwnode_handle *dev_fwnode(const struct device *dev)
If you have const struct device pointer, then the embedded fwnode handle in
that object sure is const, too. Isn't it?
If you really have const struct device pointer (where do you?), then I'd
suggest to add another function, dev_fwnode_const() that is otherwise the
same except the argument as well as the return value are const.
Or alternatively define it as a macro and use _Generic()?
> {
> return IS_ENABLED(CONFIG_OF) && dev->of_node ?
> of_fwnode_handle(dev->of_node) : dev->fwnode;
> @@ -1200,7 +1200,7 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
> }
> EXPORT_SYMBOL(fwnode_graph_parse_endpoint);
>
> -const void *device_get_match_data(struct device *dev)
> +const void *device_get_match_data(const struct device *dev)
> {
> return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev);
> }
> diff --git a/include/linux/property.h b/include/linux/property.h
> index a5b429d623f6..117cc200c656 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -32,7 +32,7 @@ enum dev_dma_attr {
> DEV_DMA_COHERENT,
> };
>
> -struct fwnode_handle *dev_fwnode(struct device *dev);
> +struct fwnode_handle *dev_fwnode(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,
> @@ -387,7 +387,7 @@ bool device_dma_supported(struct device *dev);
>
> enum dev_dma_attr device_get_dma_attr(struct device *dev);
>
> -const void *device_get_match_data(struct device *dev);
> +const void *device_get_match_data(const struct device *dev);
>
> int device_get_phy_mode(struct device *dev);
> int fwnode_get_phy_mode(struct fwnode_handle *fwnode);
--
Regards,
Sakari Ailus