[PATCH V1] pinctrl:pxa:pinctrl-pxa2xx:- No need of devm functions
From: Arvind Yadav <hidden>
Date: 2016-12-08 14:36:25
Also in:
linux-gpio, lkml
Subsystem:
pin control subsystem, pxa2xx/pxa3xx support, the rest · Maintainers:
Linus Walleij, Daniel Mack, Haojian Zhuang, Robert Jarzmik, Linus Torvalds
In functions pxa2xx_build_functions, the memory allocated for 'functions' is live within the function only. After the allocation it is immediately freed with devm_kfree. There is no need to allocate memory for 'functions' with devm function so replace devm_kcalloc with kcalloc and devm_kfree with kfree. Signed-off-by: Arvind Yadav <redacted> --- drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/pxa/pinctrl-pxa2xx.c b/drivers/pinctrl/pxa/pinctrl-pxa2xx.c
index 866aa3c..47b8e3a 100644
--- a/drivers/pinctrl/pxa/pinctrl-pxa2xx.c
+++ b/drivers/pinctrl/pxa/pinctrl-pxa2xx.c@@ -277,7 +277,7 @@ static int pxa2xx_build_functions(struct pxa_pinctrl *pctl) * alternate function, 6 * npins is an absolute high limit of the number * of functions. */ - functions = devm_kcalloc(pctl->dev, pctl->npins * 6, + functions = kcalloc(pctl->npins * 6, sizeof(*functions), GFP_KERNEL); if (!functions) return -ENOMEM;
@@ -289,10 +289,12 @@ static int pxa2xx_build_functions(struct pxa_pinctrl *pctl) pctl->functions = devm_kmemdup(pctl->dev, functions, pctl->nfuncs * sizeof(*functions), GFP_KERNEL); - if (!pctl->functions) + if (!pctl->functions) { + kfree(functions); return -ENOMEM; + } - devm_kfree(pctl->dev, functions); + kfree(functions); return 0; }
--
2.7.4