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

pinctrl: st: 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: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2021-11-05 14:42:40 +02:00
parent 3d4d3e0a7d
commit 3956d6c85f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pinctrl/pinctrl-st.c
View File

@ -1624,6 +1624,8 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
for_each_child_of_node(np, child) { for_each_child_of_node(np, child) {
if (of_property_read_bool(child, "gpio-controller")) { if (of_property_read_bool(child, "gpio-controller")) {
const char *bank_name = NULL; const char *bank_name = NULL;
char **pin_names;
ret = st_gpiolib_register_bank(info, bank, child); ret = st_gpiolib_register_bank(info, bank, child);
if (ret) { if (ret) {
of_node_put(child); of_node_put(child);
@ -1632,10 +1634,16 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
k = info->banks[bank].range.pin_base; k = info->banks[bank].range.pin_base;
bank_name = info->banks[bank].range.name; bank_name = info->banks[bank].range.name;
pin_names = devm_kasprintf_strarray(dev, bank_name, ST_GPIO_PINS_PER_BANK);
if (IS_ERR(pin_names)) {
of_node_put(child);
return PTR_ERR(pin_names);
}
for (j = 0; j < ST_GPIO_PINS_PER_BANK; j++, k++) { for (j = 0; j < ST_GPIO_PINS_PER_BANK; j++, k++) {
pdesc->number = k; pdesc->number = k;
pdesc->name = kasprintf(GFP_KERNEL, "%s[%d]", pdesc->name = pin_names[j];
bank_name, j);
pdesc++; pdesc++;
} }
st_parse_syscfgs(info, bank, child); st_parse_syscfgs(info, bank, child);