On Tue 28 Aug 02:33 PDT 2018, Bartosz Golaszewski wrote:
> Make devm_kfree() signature uniform with that of kfree(). To avoid
> compiler warnings: cast p to (void *) when calling devres_destroy().
>
Reviewed-by: Bjorn Andersson <bjorn.anders...@linaro.org>
Regards,
Bjorn
> Signed-off-by: Bartosz Golaszewski <b...@bgdev.pl>
> ---
> drivers/base/devres.c | 5 +++--
> include/linux/device.h | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/devres.c b/drivers/base/devres.c
> index f98a097e73f2..438c91a43508 100644
> --- a/drivers/base/devres.c
> +++ b/drivers/base/devres.c
> @@ -885,11 +885,12 @@ EXPORT_SYMBOL_GPL(devm_kasprintf);
> *
> * Free memory allocated with devm_kmalloc().
> */
> -void devm_kfree(struct device *dev, void *p)
> +void devm_kfree(struct device *dev, const void *p)
> {
> int rc;
>
> - rc = devres_destroy(dev, devm_kmalloc_release, devm_kmalloc_match, p);
> + rc = devres_destroy(dev, devm_kmalloc_release,
> + devm_kmalloc_match, (void *)p);
> WARN_ON(rc);
> }
> EXPORT_SYMBOL_GPL(devm_kfree);
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 8f882549edee..33f7cb271fbb 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -692,7 +692,7 @@ static inline void *devm_kcalloc(struct device *dev,
> {
> return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);
> }
> -extern void devm_kfree(struct device *dev, void *p);
> +extern void devm_kfree(struct device *dev, const void *p);
> extern char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp)
> __malloc;
> extern void *devm_kmemdup(struct device *dev, const void *src, size_t len,
> gfp_t gfp);
> --
> 2.18.0
>
