leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devres: constify p in devm_kfree()

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

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bartosz Golaszewski 2018-10-14 17:20:07 +02:00 committed by Greg Kroah-Hartman
parent 8514c470dc
commit 0571967dfb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/devres.c
View File

@ -885,11 +885,12 @@ EXPORT_SYMBOL_GPL(devm_kasprintf);
* *
* Free memory allocated with devm_kmalloc(). * 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; 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); WARN_ON(rc);
} }
EXPORT_SYMBOL_GPL(devm_kfree); EXPORT_SYMBOL_GPL(devm_kfree);

2
include/linux/device.h
View File

@ -694,7 +694,7 @@ static inline void *devm_kcalloc(struct device *dev,
{ {
return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO); 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 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, extern void *devm_kmemdup(struct device *dev, const void *src, size_t len,
gfp_t gfp); gfp_t gfp);