| Message ID | 20211105124242.27288-19-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,01/19] lib/string_helpers: Introduce kasprintf_strarray() | expand |
On Fri, Nov 5, 2021 at 1:43 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Since we have a generic helper, switch the module to use it. > No functional change intended. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, Nov 5, 2021 at 1:43 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Since we have a generic helper, switch the module to use it. > No functional change intended. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-mockup.c | 23 +---------------------- > 1 file changed, 1 insertion(+), 22 deletions(-) > > diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c > index d26bff29157b..8943cea92764 100644 > --- a/drivers/gpio/gpio-mockup.c > +++ b/drivers/gpio/gpio-mockup.c > @@ -491,27 +491,6 @@ static void gpio_mockup_unregister_pdevs(void) > } > } > > -static __init char **gpio_mockup_make_line_names(const char *label, > - unsigned int num_lines) > -{ > - unsigned int i; > - char **names; > - > - names = kcalloc(num_lines + 1, sizeof(char *), GFP_KERNEL); > - if (!names) > - return NULL; > - > - for (i = 0; i < num_lines; i++) { > - names[i] = kasprintf(GFP_KERNEL, "%s-%u", label, i); > - if (!names[i]) { > - kfree_strarray(names, i); > - return NULL; > - } > - } > - > - return names; > -} > - > static int __init gpio_mockup_register_chip(int idx) > { > struct property_entry properties[GPIO_MOCKUP_MAX_PROP]; > @@ -538,7 +517,7 @@ static int __init gpio_mockup_register_chip(int idx) > properties[prop++] = PROPERTY_ENTRY_U16("nr-gpios", ngpio); > > if (gpio_mockup_named_lines) { > - line_names = gpio_mockup_make_line_names(chip_label, ngpio); > + line_names = kasprintf_strarray(GFP_KERNEL, chip_label, ngpio); > if (!line_names) > return -ENOMEM; > > -- > 2.33.0 > Acked-by: Bartosz Golaszewski <brgl@bgdev.pl> Feel free to take it with the rest of the series. Bart
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index d26bff29157b..8943cea92764 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -491,27 +491,6 @@ static void gpio_mockup_unregister_pdevs(void) } } -static __init char **gpio_mockup_make_line_names(const char *label, - unsigned int num_lines) -{ - unsigned int i; - char **names; - - names = kcalloc(num_lines + 1, sizeof(char *), GFP_KERNEL); - if (!names) - return NULL; - - for (i = 0; i < num_lines; i++) { - names[i] = kasprintf(GFP_KERNEL, "%s-%u", label, i); - if (!names[i]) { - kfree_strarray(names, i); - return NULL; - } - } - - return names; -} - static int __init gpio_mockup_register_chip(int idx) { struct property_entry properties[GPIO_MOCKUP_MAX_PROP]; @@ -538,7 +517,7 @@ static int __init gpio_mockup_register_chip(int idx) properties[prop++] = PROPERTY_ENTRY_U16("nr-gpios", ngpio); if (gpio_mockup_named_lines) { - line_names = gpio_mockup_make_line_names(chip_label, ngpio); + line_names = kasprintf_strarray(GFP_KERNEL, chip_label, ngpio); if (!line_names) return -ENOMEM;
Since we have a generic helper, switch the module to use it. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-mockup.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)