From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Jonathan Corbet <corbet@lwn.net>,
Kent Gibson <warthog618@gmail.com>,
linux-gpio@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: [PATCH v2 8/9] gpio: mockup: use the generic 'gpio-line-names' property
Date: Mon, 28 Sep 2020 16:01:40 +0300 [thread overview]
Message-ID: <20200928130140.GK3956970@smile.fi.intel.com> (raw)
In-Reply-To: <20200928104155.7385-9-brgl@bgdev.pl>
On Mon, Sep 28, 2020 at 12:41:54PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>
> GPIO line names are currently created by the driver from the chip label.
> We'll want to support custom formats for line names (for instance: to
> name all lines the same) for user-space tests so create them in the
> module init function and pass them to the driver using the standard
> 'gpio-line-names' property.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
> drivers/gpio/gpio-mockup.c | 70 +++++++++++++++++++++-----------------
> 1 file changed, 38 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
> index 5b2686f9e07d..47b7de6d5ab1 100644
> --- a/drivers/gpio/gpio-mockup.c
> +++ b/drivers/gpio/gpio-mockup.c
> @@ -19,6 +19,7 @@
> #include <linux/platform_device.h>
> #include <linux/property.h>
> #include <linux/slab.h>
> +#include <linux/string_helpers.h>
> #include <linux/uaccess.h>
>
> #include "gpiolib.h"
> @@ -374,29 +375,6 @@ static void gpio_mockup_debugfs_setup(struct device *dev,
> }
> }
>
> -static int gpio_mockup_name_lines(struct device *dev,
> - struct gpio_mockup_chip *chip)
> -{
> - struct gpio_chip *gc = &chip->gc;
> - char **names;
> - int i;
> -
> - names = devm_kcalloc(dev, gc->ngpio, sizeof(char *), GFP_KERNEL);
> - if (!names)
> - return -ENOMEM;
> -
> - for (i = 0; i < gc->ngpio; i++) {
> - names[i] = devm_kasprintf(dev, GFP_KERNEL,
> - "%s-%d", gc->label, i);
> - if (!names[i])
> - return -ENOMEM;
> - }
> -
> - gc->names = (const char *const *)names;
> -
> - return 0;
> -}
> -
> static void gpio_mockup_dispose_mappings(void *data)
> {
> struct gpio_mockup_chip *chip = data;
> @@ -464,12 +442,6 @@ static int gpio_mockup_probe(struct platform_device *pdev)
> for (i = 0; i < gc->ngpio; i++)
> chip->lines[i].dir = GPIO_LINE_DIRECTION_IN;
>
> - if (device_property_read_bool(dev, "named-gpio-lines")) {
> - rv = gpio_mockup_name_lines(dev, chip);
> - if (rv)
> - return rv;
> - }
> -
> chip->irq_sim_domain = devm_irq_domain_create_sim(dev, NULL,
> gc->ngpio);
> if (IS_ERR(chip->irq_sim_domain))
> @@ -510,6 +482,27 @@ 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_init(void)
> {
> struct property_entry properties[GPIO_MOCKUP_MAX_PROP];
> @@ -517,6 +510,7 @@ static int __init gpio_mockup_init(void)
> struct platform_device_info pdevinfo;
> struct platform_device *pdev;
> char chip_label[32];
> + char **line_names;
> u16 ngpio;
>
> if ((gpio_mockup_num_ranges < 2) ||
> @@ -549,6 +543,7 @@ static int __init gpio_mockup_init(void)
> memset(properties, 0, sizeof(properties));
> memset(&pdevinfo, 0, sizeof(pdevinfo));
> prop = 0;
> + line_names = NULL;
>
> snprintf(chip_label, sizeof(chip_label),
> "gpio-mockup-%c", i + 'A');
> @@ -564,15 +559,26 @@ static int __init gpio_mockup_init(void)
> : gpio_mockup_range_ngpio(i) - base;
> properties[prop++] = PROPERTY_ENTRY_U16("nr-gpios", ngpio);
>
> - if (gpio_mockup_named_lines)
> - properties[prop++] = PROPERTY_ENTRY_BOOL(
> - "named-gpio-lines");
> + if (gpio_mockup_named_lines) {
> + line_names = gpio_mockup_make_line_names(chip_label,
> + ngpio);
> + if (!line_names) {
> + platform_driver_unregister(&gpio_mockup_driver);
> + gpio_mockup_unregister_pdevs();
> + return -ENOMEM;
> + }
> +
> + properties[prop++] = PROPERTY_ENTRY_STRING_ARRAY_LEN(
> + "gpio-line-names",
> + line_names, ngpio);
> + }
>
> pdevinfo.name = "gpio-mockup";
> pdevinfo.id = i;
> pdevinfo.properties = properties;
>
> pdev = platform_device_register_full(&pdevinfo);
> + kfree_strarray(line_names, ngpio);
> if (IS_ERR(pdev)) {
> pr_err("error registering device");
> platform_driver_unregister(&gpio_mockup_driver);
> --
> 2.26.1
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-09-28 13:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 10:41 [PATCH v2 0/9] gpio: mockup: refactoring + documentation Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 1/9] lib: string_helpers: provide kfree_strarray() Bartosz Golaszewski
2020-09-28 12:55 ` Andy Shevchenko
2020-09-28 13:04 ` Bartosz Golaszewski
2020-09-28 13:56 ` Andy Shevchenko
2020-09-28 15:59 ` Joe Perches
2020-09-28 16:02 ` Bartosz Golaszewski
2020-09-28 16:06 ` Joe Perches
2020-09-28 16:25 ` Andy Shevchenko
2020-09-29 8:10 ` David Laight
2020-09-29 8:49 ` Andy Shevchenko
2020-09-29 9:42 ` Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 2/9] Documentation: gpio: add documentation for gpio-mockup Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 3/9] gpio: mockup: drop unneeded includes Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 4/9] gpio: mockup: use KBUILD_MODNAME Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 5/9] gpio: mockup: use pr_fmt() Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 6/9] gpio: mockup: remove unneeded return statement Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 7/9] gpio: mockup: pass the chip label as device property Bartosz Golaszewski
2020-09-28 13:00 ` Andy Shevchenko
2020-09-28 13:13 ` Bartosz Golaszewski
2020-09-28 14:00 ` Andy Shevchenko
2020-09-28 14:52 ` Bartosz Golaszewski
2020-09-28 16:24 ` Andy Shevchenko
2020-09-28 10:41 ` [PATCH v2 8/9] gpio: mockup: use the generic 'gpio-line-names' property Bartosz Golaszewski
2020-09-28 13:01 ` Andy Shevchenko [this message]
2020-09-28 10:41 ` [PATCH v2 9/9] gpio: mockup: refactor the module init function Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928130140.GK3956970@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=brgl@bgdev.pl \
--cc=corbet@lwn.net \
--cc=linus.walleij@linaro.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=warthog618@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).