From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
Jonathan Corbet <corbet@lwn.net>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Kent Gibson <warthog618@gmail.com>
Cc: 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: [PATCH 11/23] gpio: mockup: remove the limit on number of dummy chips
Date: Fri, 4 Sep 2020 17:45:35 +0200 [thread overview]
Message-ID: <20200904154547.3836-12-brgl@bgdev.pl> (raw)
In-Reply-To: <20200904154547.3836-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
As a preparation for implementing dynamically created dummy GPIO chips:
drop the limit on the number of chips. Let's use a linked list to store
the chip context structures.
Let's rename gpio_mockup_unregister_pdevs() to
gpio_mockup_unregister_devices() as we're now handling structures in
which struct platform_device is embedded instead of operating on
platform devices directly.
Note: this does not remove the limit on the number of ranges passed as a
module parameter. For now nothing changes in how the module works for
user-space. This patch will however allow us to create a higher number
of chips once we can do this dynamically.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/gpio/gpio-mockup.c | 59 ++++++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 19 deletions(-)
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index 19c092f814fd..801fba6496a4 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -13,6 +13,7 @@
#include <linux/irq.h>
#include <linux/irq_sim.h>
#include <linux/irqdomain.h>
+#include <linux/list.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/property.h>
@@ -24,12 +25,11 @@
#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#define GPIO_MOCKUP_MAX_GC 10
/*
* We're storing two values per chip: the GPIO base and the number
* of GPIO lines.
*/
-#define GPIO_MOCKUP_MAX_RANGES (GPIO_MOCKUP_MAX_GC * 2)
+#define GPIO_MOCKUP_MAX_RANGES (10 * 2)
/* Maximum of three properties + the sentinel. */
#define GPIO_MOCKUP_MAX_PROP 4
@@ -505,27 +505,37 @@ static struct platform_driver gpio_mockup_driver = {
.probe = gpio_mockup_probe,
};
-static struct platform_device *gpio_mockup_pdevs[GPIO_MOCKUP_MAX_GC];
+struct gpio_mockup_device {
+ struct list_head list;
+ struct platform_device *pdev;
+};
-static void gpio_mockup_unregister_pdevs(void)
+static LIST_HEAD(gpio_mockup_devices);
+
+static void gpio_mockup_unregister_one_device(struct gpio_mockup_device *dev)
{
- struct platform_device *pdev;
- int i;
+ list_del(&dev->list);
+ platform_device_unregister(dev->pdev);
+ kfree(dev);
+}
- for (i = 0; i < GPIO_MOCKUP_MAX_GC; i++) {
- pdev = gpio_mockup_pdevs[i];
+static void gpio_mockup_unregister_devices(void)
+{
+ struct gpio_mockup_device *mockup_dev;
+ struct list_head *curr, *next;
- if (pdev)
- platform_device_unregister(pdev);
+ list_for_each_safe(curr, next, &gpio_mockup_devices) {
+ mockup_dev = list_entry(curr, struct gpio_mockup_device, list);
+ gpio_mockup_unregister_one_device(mockup_dev);
}
}
static int __init gpio_mockup_init(void)
{
struct property_entry properties[GPIO_MOCKUP_MAX_PROP];
+ struct gpio_mockup_device *mockup_dev;
int i, prop, num_chips, err = 0, base;
struct platform_device_info pdevinfo;
- struct platform_device *pdev;
u16 ngpio;
if ((gpio_mockup_num_ranges < 2) ||
@@ -576,26 +586,37 @@ static int __init gpio_mockup_init(void)
pdevinfo.id = i;
pdevinfo.properties = properties;
- pdev = platform_device_register_full(&pdevinfo);
- if (IS_ERR(pdev)) {
+ mockup_dev = kzalloc(sizeof(*mockup_dev), GFP_KERNEL);
+ if (!mockup_dev) {
+ err = -ENOMEM;
+ goto err_out;
+ }
+
+ mockup_dev->pdev = platform_device_register_full(&pdevinfo);
+ if (IS_ERR(mockup_dev->pdev)) {
pr_err("error registering device");
- platform_driver_unregister(&gpio_mockup_driver);
- gpio_mockup_unregister_pdevs();
- debugfs_remove_recursive(gpio_mockup_dbg_dir);
- return PTR_ERR(pdev);
+ kfree(mockup_dev);
+ err = PTR_ERR(mockup_dev->pdev);
+ goto err_out;
}
- gpio_mockup_pdevs[i] = pdev;
+ list_add(&mockup_dev->list, &gpio_mockup_devices);
}
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)
{
debugfs_remove_recursive(gpio_mockup_dbg_dir);
platform_driver_unregister(&gpio_mockup_driver);
- gpio_mockup_unregister_pdevs();
+ gpio_mockup_unregister_devices();
}
module_init(gpio_mockup_init);
--
2.26.1
next prev parent reply other threads:[~2020-09-04 15:49 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 ` Bartosz Golaszewski [this message]
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
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=20200904154547.3836-12-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--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).