lkml.org 
[lkml]   [2021]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 07/19] pinctrl/rockchip: Switch to use devm_kasprintf_strarray()
    Date
    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>
    ---
    drivers/pinctrl/pinctrl-rockchip.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
    index 929c96ea621a..438808a867cf 100644
    --- a/drivers/pinctrl/pinctrl-rockchip.c
    +++ b/drivers/pinctrl/pinctrl-rockchip.c
    @@ -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++;
    }

    --
    2.33.0
    \
     
     \ /
      Last update: 2021-11-05 13:44    [W:5.114 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site