Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0571967d authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

devres: constify p in devm_kfree() 



Make devm_kfree() signature uniform with that of kfree(). To avoid
compiler warnings: cast p to (void *) when calling devres_destroy().

Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8514c470

drivers/base/devres.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/device.h

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,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);