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>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Kent Gibson <warthog618@gmail.com>,
linux-gpio@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: [PATCH 16/23] gpio: mockup: refactor the module init function
Date: Fri, 4 Sep 2020 19:50:29 +0300 [thread overview]
Message-ID: <20200904165029.GD1891694@smile.fi.intel.com> (raw)
In-Reply-To: <20200904154547.3836-17-brgl@bgdev.pl>
On Fri, Sep 04, 2020 at 05:45:40PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>
> This is in preparation for dynamically created chips.
>
> Let's split out the code that can be reused when creating chips at
> run-time. Let's also move the code preparing the device properties into
> a separate routine. This has the advantage of simplifying the error
> handling.
Almost all contents of this patch should go to proposed helper as I mentioned
before. Will make this patch quite small and understandable.
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
> drivers/gpio/gpio-mockup.c | 165 ++++++++++++++++++++-----------------
> 1 file changed, 90 insertions(+), 75 deletions(-)
>
> diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
> index 995e37fef9c5..eb94ddac5fee 100644
> --- a/drivers/gpio/gpio-mockup.c
> +++ b/drivers/gpio/gpio-mockup.c
> @@ -524,16 +524,78 @@ static __init char **gpio_mockup_make_line_names(const char *label,
> return names;
> }
>
> -static int __init gpio_mockup_init(void)
> +static int __init gpio_mockup_register_device(struct property_entry *properties)
> {
> - struct property_entry properties[GPIO_MOCKUP_MAX_PROP];
> - char chip_label[GPIO_MOCKUP_LABEL_SIZE];
> struct gpio_mockup_device *mockup_dev;
> - int i, prop, num_chips, err = 0, base;
> struct platform_device_info pdevinfo;
> - char **line_names;
> +
> + memset(&pdevinfo, 0, sizeof(pdevinfo));
> +
> + mockup_dev = kzalloc(sizeof(*mockup_dev), GFP_KERNEL);
> + if (!mockup_dev)
> + return -ENOMEM;
> +
> + pdevinfo.name = "gpio-mockup";
> + pdevinfo.properties = properties;
> +
> + pdevinfo.id = ida_alloc(&gpio_mockup_ida, GFP_KERNEL);
> + if (pdevinfo.id < 0) {
> + kfree(mockup_dev);
> + return pdevinfo.id;
> + }
> +
> + mockup_dev->pdev = platform_device_register_full(&pdevinfo);
> + if (IS_ERR(mockup_dev->pdev)) {
> + ida_free(&gpio_mockup_ida, pdevinfo.id);
> + kfree(mockup_dev);
> + return PTR_ERR(mockup_dev->pdev);
> + }
> +
> + list_add(&mockup_dev->list, &gpio_mockup_devices);
> +
> + return 0;
> +}
> +
> +static int __init gpio_mockup_register_one_chip_from_params(int idx)
> +{
> + char chip_label[GPIO_MOCKUP_LABEL_SIZE], **line_names = NULL;
> + struct property_entry properties[GPIO_MOCKUP_MAX_PROP];
> + int prop = 0, base, ret;
> u16 ngpio;
>
> + memset(properties, 0, sizeof(properties));
> +
> + snprintf(chip_label, sizeof(chip_label), "gpio-mockup-%c", idx + 'A');
> + properties[prop++] = PROPERTY_ENTRY_STRING("chip-label",
> + chip_label);
> +
> + base = gpio_mockup_range_base(idx);
> + if (base >= 0)
> + properties[prop++] = PROPERTY_ENTRY_U32("gpio-base",
> + base);
> +
> + ngpio = base < 0 ? gpio_mockup_range_ngpio(idx)
> + : gpio_mockup_range_ngpio(idx) - base;
> + properties[prop++] = PROPERTY_ENTRY_U16("nr-gpios", ngpio);
> +
> + if (gpio_mockup_named_lines) {
> + line_names = gpio_mockup_make_line_names(chip_label, ngpio);
> + if (!line_names)
> + return -ENOMEM;
> +
> + properties[prop++] = PROPERTY_ENTRY_STRING_ARRAY_LEN(
> + "gpio-line-names", line_names, ngpio);
> + }
> +
> + ret = gpio_mockup_register_device(properties);
> + kfree_strarray(line_names, ngpio);
> + return ret;
> +}
> +
> +static int __init gpio_mockup_register_chips_from_params(void)
> +{
> + int num_chips, i, ret;
> +
> if ((gpio_mockup_num_ranges < 2) ||
> (gpio_mockup_num_ranges % 2) ||
> (gpio_mockup_num_ranges > GPIO_MOCKUP_MAX_RANGES))
> @@ -551,86 +613,39 @@ static int __init gpio_mockup_init(void)
> return -EINVAL;
> }
>
> - gpio_mockup_dbg_dir = debugfs_create_dir("gpio-mockup", NULL);
> -
> - err = platform_driver_register(&gpio_mockup_driver);
> - if (err) {
> - pr_err("error registering platform driver\n");
> - debugfs_remove_recursive(gpio_mockup_dbg_dir);
> - return err;
> - }
> -
> for (i = 0; i < num_chips; i++) {
> - 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');
> - properties[prop++] = PROPERTY_ENTRY_STRING("chip-label",
> - chip_label);
> -
> - base = gpio_mockup_range_base(i);
> - if (base >= 0)
> - properties[prop++] = PROPERTY_ENTRY_U32("gpio-base",
> - base);
> -
> - ngpio = base < 0 ? gpio_mockup_range_ngpio(i)
> - : gpio_mockup_range_ngpio(i) - base;
> - properties[prop++] = PROPERTY_ENTRY_U16("nr-gpios", ngpio);
> -
> - if (gpio_mockup_named_lines) {
> - line_names = gpio_mockup_make_line_names(chip_label,
> - ngpio);
> - if (!line_names) {
> - err = -ENOMEM;
> - goto err_out;
> - }
> -
> - properties[prop++] = PROPERTY_ENTRY_STRING_ARRAY_LEN(
> - "gpio-line-names",
> - line_names, ngpio);
> + ret = gpio_mockup_register_one_chip_from_params(i);
> + if (ret) {
> + gpio_mockup_unregister_devices();
> + return ret;
> }
> + }
>
> - pdevinfo.name = "gpio-mockup";
> - pdevinfo.properties = properties;
> + return 0;
> +}
>
> - pdevinfo.id = ida_alloc(&gpio_mockup_ida, GFP_KERNEL);
> - if (pdevinfo.id < 0) {
> - kfree_strarray(line_names, ngpio);
> - err = pdevinfo.id;
> - goto err_out;
> - }
> +static int __init gpio_mockup_init(void)
> +{
> + int ret;
>
> - mockup_dev = kzalloc(sizeof(*mockup_dev), GFP_KERNEL);
> - if (!mockup_dev) {
> - kfree_strarray(line_names, ngpio);
> - ida_free(&gpio_mockup_ida, pdevinfo.id);
> - err = -ENOMEM;
> - goto err_out;
> - }
> + gpio_mockup_dbg_dir = debugfs_create_dir("gpio-mockup", NULL);
>
> - mockup_dev->pdev = platform_device_register_full(&pdevinfo);
> - kfree_strarray(line_names, ngpio);
> - if (IS_ERR(mockup_dev->pdev)) {
> - pr_err("error registering device");
> - ida_free(&gpio_mockup_ida, pdevinfo.id);
> - kfree(mockup_dev);
> - err = PTR_ERR(mockup_dev->pdev);
> - goto err_out;
> - }
> + ret = platform_driver_register(&gpio_mockup_driver);
> + if (ret) {
> + pr_err("error registering platform driver\n");
> + debugfs_remove_recursive(gpio_mockup_dbg_dir);
> + return ret;
> + }
>
> - list_add(&mockup_dev->list, &gpio_mockup_devices);
> + ret = gpio_mockup_register_chips_from_params();
> + if (ret) {
> + pr_err("error registering device");
> + debugfs_remove_recursive(gpio_mockup_dbg_dir);
> + platform_driver_unregister(&gpio_mockup_driver);
> + return ret;
> }
>
> return 0;
> -
> -err_out:
> - platform_driver_unregister(&gpio_mockup_driver);
> - gpio_mockup_unregister_devices();
> - debugfs_remove_recursive(gpio_mockup_dbg_dir);
> - return err;
> }
>
> static void __exit gpio_mockup_exit(void)
> --
> 2.26.1
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-09-04 16:57 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 15:45 [PATCH 00/23] gpio: mockup: support dynamically created and removed chips Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 01/23] lib: cmdline: export next_arg() Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 02/23] lib: string_helpers: provide kfree_strarray() Bartosz Golaszewski
2020-09-04 16:33 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 03/23] lib: uaccess: provide getline_from_user() Bartosz Golaszewski
2020-09-04 16:35 ` Andy Shevchenko
2020-09-07 10:02 ` Bartosz Golaszewski
2020-09-07 10:18 ` Andy Shevchenko
2020-09-07 10:28 ` Bartosz Golaszewski
2020-09-07 11:45 ` Andy Shevchenko
2020-09-07 11:57 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 04/23] gpiolib: generalize devprop_gpiochip_set_names() for device properties Bartosz Golaszewski
2020-09-04 16:38 ` Andy Shevchenko
2020-09-07 10:56 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 05/23] gpiolib: unexport devprop_gpiochip_set_names() Bartosz Golaszewski
2020-09-04 16:40 ` Andy Shevchenko
2020-09-07 10:53 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 06/23] gpiolib: switch to simpler IDA interface Bartosz Golaszewski
2020-09-04 16:41 ` Andy Shevchenko
2020-09-07 10:50 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 07/23] gpio: mockup: drop unneeded includes Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 08/23] gpio: mockup: use pr_fmt() Bartosz Golaszewski
2020-09-04 16:29 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 09/23] gpio: mockup: use KBUILD_MODNAME Bartosz Golaszewski
2020-09-04 16:30 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 10/23] gpio: mockup: fix resource leak in error path Bartosz Golaszewski
2020-09-04 17:00 ` Andy Shevchenko
2020-09-07 11:04 ` Bartosz Golaszewski
2020-09-07 11:47 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 11/23] gpio: mockup: remove the limit on number of dummy chips Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 12/23] gpio: mockup: define a constant for chip label size Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 13/23] gpio: mockup: pass the chip label as device property Bartosz Golaszewski
2020-09-04 16:48 ` Andy Shevchenko
2020-09-07 11:01 ` Bartosz Golaszewski
2020-09-07 11:48 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 14/23] gpio: mockup: use the generic 'gpio-line-names' property Bartosz Golaszewski
2020-09-04 16:46 ` Andy Shevchenko
2020-09-07 10:58 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 15/23] gpio: mockup: use dynamic device IDs Bartosz Golaszewski
2020-09-04 16:49 ` Andy Shevchenko
2020-09-07 11:04 ` Bartosz Golaszewski
2020-09-07 11:50 ` Andy Shevchenko
2020-09-07 11:59 ` Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 16/23] gpio: mockup: refactor the module init function Bartosz Golaszewski
2020-09-04 16:50 ` Andy Shevchenko [this message]
2020-09-07 11:05 ` Bartosz Golaszewski
2020-09-07 11:51 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 17/23] gpio: mockup: rename and move around debugfs callbacks Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 18/23] gpio: mockup: require debugfs to build Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 19/23] gpio: mockup: add a symlink for the per-chip debugfs directory Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 20/23] gpio: mockup: add a lock for dummy device list Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 21/23] gpio: mockup: provide a way to delete dummy chips Bartosz Golaszewski
2020-09-04 16:56 ` Andy Shevchenko
2020-09-04 15:45 ` [PATCH 22/23] gpio: mockup: provide a way to create new " Bartosz Golaszewski
2020-09-04 15:45 ` [PATCH 23/23] Documentation: gpio: add documentation for gpio-mockup Bartosz Golaszewski
2020-09-04 16:58 ` Andy Shevchenko
2020-09-05 3:15 ` Randy Dunlap
2020-09-07 9:59 ` Andy Shevchenko
2020-09-07 10:26 ` Bartosz Golaszewski
2020-09-07 11:53 ` Andy Shevchenko
2020-09-07 12:06 ` Bartosz Golaszewski
2020-09-07 12:22 ` Greg Kroah-Hartman
2020-09-07 13:49 ` Bartosz Golaszewski
2020-09-07 14:08 ` Andy Shevchenko
2020-09-07 15:14 ` Bartosz Golaszewski
2020-09-07 15:23 ` Geert Uytterhoeven
2020-09-07 16:08 ` Bartosz Golaszewski
2020-09-08 17:03 ` Bartosz Golaszewski
2020-09-11 12:56 ` Greg Kroah-Hartman
2020-09-11 13:07 ` Bartosz Golaszewski
2020-09-07 12:38 ` Andy Shevchenko
2020-09-07 12:57 ` Bartosz Golaszewski
2020-09-07 13:52 ` Andy Shevchenko
2020-09-07 10:45 ` 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=20200904165029.GD1891694@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-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--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).