[PATCH v1 12/19] pinctrl: armada-37xx: Switch to use devm_kasprintf_strarray()

[Gregory CLEMENT]

Hello Andy,

> Since we have a generic helper, switch the module to use it.
>
> As a side effect, add check for the memory allocation failures and
> cleanup it either in error case or when driver is unloading.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>

Reviewed-by: Gregory CLEMENT <gregory.clement at bootlin.com>

Thanks,

Gregory

> ---
>  drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> index f48745c43419..08cad14042e2 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> @@ -23,6 +23,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
>  #include <linux/slab.h>
> +#include <linux/string_helpers.h>
>  
>  #include "../pinctrl-utils.h"
>  
> @@ -951,6 +952,7 @@ static int armada_37xx_pinctrl_register(struct platform_device *pdev,
>  	struct pinctrl_desc *ctrldesc = &info->pctl;
>  	struct pinctrl_pin_desc *pindesc, *pdesc;
>  	struct device *dev = &pdev->dev;
> +	char **pin_names;
>  	int pin, ret;
>  
>  	info->groups = pin_data->groups;
> @@ -969,11 +971,14 @@ static int armada_37xx_pinctrl_register(struct platform_device *pdev,
>  	ctrldesc->pins = pindesc;
>  	ctrldesc->npins = pin_data->nr_pins;
>  
> +	pin_names = devm_kasprintf_strarray(dev, pin_data->name, pin_data->nr_pins);
> +	if (IS_ERR(pin_names))
> +		return PTR_ERR(pin_names);
> +
>  	pdesc = pindesc;
>  	for (pin = 0; pin < pin_data->nr_pins; pin++) {
>  		pdesc->number = pin;
> -		pdesc->name = kasprintf(GFP_KERNEL, "%s-%d",
> -					pin_data->name, pin);
> +		pdesc->name = pin_names[pin];
>  		pdesc++;
>  	}
>  
> -- 
> 2.33.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com