Thread (43 messages) flat view 43 messages, 6 authors, 2021-11-18

Re: [PATCH v1 19/19] gpio: mockup: Switch to use kasprintf_strarray()

From: Bartosz Golaszewski <hidden>
Date: 2021-11-16 09:12:50
Also in: linux-gpio, linux-rockchip, lkml

On Fri, Nov 5, 2021 at 1:43 PM Andy Shevchenko
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
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 <redacted>

Feel free to take it with the rest of the series.

Bart

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help