mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-25 02:09:42 +00:00
Code Issues Releases Wiki Activity

pinctrl/rockchip: Switch to use devm_kasprintf_strarray()

Browse source 
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@linux.intel.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Andy Shevchenko 2021-11-05 14:42:30 +02:00
parent 0045028f31
commit 069d7796c9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/pinctrl/pinctrl-rockchip.c
View file

@ -33,6 +33,8 @@
#include <linux/clk.h>
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
#include <linux/string_helpers.h>
#include <dt-bindings/pinctrl/rockchip.h>
#include "core.h"
@ -2452,6 +2454,7 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,
struct pinctrl_pin_desc *pindesc, *pdesc;
struct rockchip_pin_bank *pin_bank;
struct device *dev = &pdev->dev;
char **pin_names;
int pin, bank, ret;
int k;
@ -2471,10 +2474,14 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,
pdesc = pindesc;
for (bank = 0, k = 0; bank < info->ctrl->nr_banks; bank++) {
pin_bank = &info->ctrl->pin_banks[bank];
pin_names = devm_kasprintf_strarray(dev, pin_bank->name, pin_bank->nr_pins);
if (IS_ERR(pin_names))
return PTR_ERR(pin_names);
for (pin = 0; pin < pin_bank->nr_pins; pin++, k++) {
pdesc->number = k;
pdesc->name = kasprintf(GFP_KERNEL, "%s-%d",
pin_bank->name, pin);
pdesc->name = pin_names[pin];
pdesc++;
}