Update gpio-virtuser to use the new gpio-pseudo helper functions for
synchronized platform device creation, reducing code duplication.
No functional change.
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
---
drivers/gpio/Kconfig | 1 +
drivers/gpio/gpio-virtuser.c | 73 +++++-------------------------------
2 files changed, 11 insertions(+), 63 deletions(-)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c482e3494bac..d8fede07149f 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1942,6 +1942,7 @@ config GPIO_VIRTUSER
select DEBUG_FS
select CONFIGFS_FS
select IRQ_WORK
+ select GPIO_PSEUDO
help
Say Y here to enable the configurable, configfs-based virtual GPIO
consumer testing driver.
diff --git a/drivers/gpio/gpio-virtuser.c b/drivers/gpio/gpio-virtuser.c
index e89f299f2140..a825edc6fbc5 100644
--- a/drivers/gpio/gpio-virtuser.c
+++ b/drivers/gpio/gpio-virtuser.c
@@ -11,7 +11,6 @@
#include <linux/atomic.h>
#include <linux/bitmap.h>
#include <linux/cleanup.h>
-#include <linux/completion.h>
#include <linux/configfs.h>
#include <linux/debugfs.h>
#include <linux/device.h>
@@ -37,6 +36,8 @@
#include <linux/string_helpers.h>
#include <linux/types.h>
+#include "gpio-pseudo.h"
+
#define GPIO_VIRTUSER_NAME_BUF_LEN 32
static DEFINE_IDA(gpio_virtuser_ida);
@@ -973,49 +974,17 @@ static struct platform_driver gpio_virtuser_driver = {
};
struct gpio_virtuser_device {
+ struct pseudo_gpio_common common;
struct config_group group;
- struct platform_device *pdev;
int id;
struct mutex lock;
- struct notifier_block bus_notifier;
- struct completion probe_completion;
- bool driver_bound;
-
struct gpiod_lookup_table *lookup_table;
struct list_head lookup_list;
};
-static int gpio_virtuser_bus_notifier_call(struct notifier_block *nb,
- unsigned long action, void *data)
-{
- struct gpio_virtuser_device *vdev;
- struct device *dev = data;
- char devname[32];
-
- vdev = container_of(nb, struct gpio_virtuser_device, bus_notifier);
- snprintf(devname, sizeof(devname), "gpio-virtuser.%d", vdev->id);
-
- if (!device_match_name(dev, devname))
- return NOTIFY_DONE;
-
- switch (action) {
- case BUS_NOTIFY_BOUND_DRIVER:
- vdev->driver_bound = true;
- break;
- case BUS_NOTIFY_DRIVER_NOT_BOUND:
- vdev->driver_bound = false;
- break;
- default:
- return NOTIFY_DONE;
- }
-
- complete(&vdev->probe_completion);
- return NOTIFY_OK;
-}
-
static struct gpio_virtuser_device *
to_gpio_virtuser_device(struct config_item *item)
{
@@ -1029,7 +998,7 @@ gpio_virtuser_device_is_live(struct gpio_virtuser_device *dev)
{
lockdep_assert_held(&dev->lock);
- return !!dev->pdev;
+ return !!dev->common.pdev;
}
struct gpio_virtuser_lookup {
@@ -1369,7 +1338,7 @@ gpio_virtuser_device_config_dev_name_show(struct config_item *item,
guard(mutex)(&dev->lock);
- pdev = dev->pdev;
+ pdev = dev->common.pdev;
if (pdev)
return sprintf(page, "%s\n", dev_name(&pdev->dev));
@@ -1478,7 +1447,6 @@ gpio_virtuser_device_activate(struct gpio_virtuser_device *dev)
{
struct platform_device_info pdevinfo;
struct fwnode_handle *swnode;
- struct platform_device *pdev;
int ret;
lockdep_assert_held(&dev->lock);
@@ -1499,31 +1467,12 @@ gpio_virtuser_device_activate(struct gpio_virtuser_device *dev)
if (ret)
goto err_remove_swnode;
- reinit_completion(&dev->probe_completion);
- dev->driver_bound = false;
- bus_register_notifier(&platform_bus_type, &dev->bus_notifier);
-
- pdev = platform_device_register_full(&pdevinfo);
- if (IS_ERR(pdev)) {
- ret = PTR_ERR(pdev);
- bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier);
+ ret = pseudo_gpio_register(&dev->common, &pdevinfo);
+ if (ret)
goto err_remove_lookup_table;
- }
-
- wait_for_completion(&dev->probe_completion);
- bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier);
-
- if (!dev->driver_bound) {
- ret = -ENXIO;
- goto err_unregister_pdev;
- }
-
- dev->pdev = pdev;
return 0;
-err_unregister_pdev:
- platform_device_unregister(pdev);
err_remove_lookup_table:
gpio_virtuser_remove_lookup_table(dev);
err_remove_swnode:
@@ -1539,11 +1488,10 @@ gpio_virtuser_device_deactivate(struct gpio_virtuser_device *dev)
lockdep_assert_held(&dev->lock);
- swnode = dev_fwnode(&dev->pdev->dev);
- platform_device_unregister(dev->pdev);
+ swnode = dev_fwnode(&dev->common.pdev->dev);
+ pseudo_gpio_unregister(&dev->common);
gpio_virtuser_remove_lookup_table(dev);
fwnode_remove_software_node(swnode);
- dev->pdev = NULL;
}
static void
@@ -1772,8 +1720,7 @@ gpio_virtuser_config_make_device_group(struct config_group *group,
&gpio_virtuser_device_config_group_type);
mutex_init(&dev->lock);
INIT_LIST_HEAD(&dev->lookup_list);
- dev->bus_notifier.notifier_call = gpio_virtuser_bus_notifier_call;
- init_completion(&dev->probe_completion);
+ pseudo_gpio_init(&dev->common);
return &no_free_ptr(dev)->group;
}
--
2.45.2Hi Koichiro,
kernel test robot noticed the following build errors:
[auto build test ERROR on brgl/gpio/for-next]
[also build test ERROR on linus/master v6.14-rc2 next-20250214]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Koichiro-Den/gpio-aggregator-reorder-functions-to-prepare-for-configfs-introduction/20250216-210413
base: https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio/for-next
patch link: https://lore.kernel.org/r/20250216125816.14430-6-koichiro.den%40canonical.com
patch subject: [PATCH v3 05/13] gpio: virtuser: convert to use gpio-pseudo utilities
config: i386-buildonly-randconfig-003-20250216 (https://download.01.org/0day-ci/archive/20250217/202502170056.DR6nbxpY-lkp@intel.com/config)
compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250217/202502170056.DR6nbxpY-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502170056.DR6nbxpY-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/gpio/gpio-pseudo.c:62:3: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
62 | kfree(common->name);
| ^
drivers/gpio/gpio-pseudo.c:71:3: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
71 | kfree(common->name);
| ^
drivers/gpio/gpio-pseudo.c:83:2: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
83 | kfree(common->name);
| ^
3 errors generated.
vim +/kfree +62 drivers/gpio/gpio-pseudo.c
ef524a2229b717 Koichiro Den 2025-02-16 43
ef524a2229b717 Koichiro Den 2025-02-16 44 int pseudo_gpio_register(struct pseudo_gpio_common *common,
ef524a2229b717 Koichiro Den 2025-02-16 45 struct platform_device_info *pdevinfo)
ef524a2229b717 Koichiro Den 2025-02-16 46 {
ef524a2229b717 Koichiro Den 2025-02-16 47 struct platform_device *pdev;
ef524a2229b717 Koichiro Den 2025-02-16 48 char *name;
ef524a2229b717 Koichiro Den 2025-02-16 49
ef524a2229b717 Koichiro Den 2025-02-16 50 name = kasprintf(GFP_KERNEL, "%s.%u", pdevinfo->name, pdevinfo->id);
ef524a2229b717 Koichiro Den 2025-02-16 51 if (!name)
ef524a2229b717 Koichiro Den 2025-02-16 52 return -ENOMEM;
ef524a2229b717 Koichiro Den 2025-02-16 53
ef524a2229b717 Koichiro Den 2025-02-16 54 common->driver_bound = false;
ef524a2229b717 Koichiro Den 2025-02-16 55 common->name = name;
ef524a2229b717 Koichiro Den 2025-02-16 56 reinit_completion(&common->probe_completion);
ef524a2229b717 Koichiro Den 2025-02-16 57 bus_register_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 58
ef524a2229b717 Koichiro Den 2025-02-16 59 pdev = platform_device_register_full(pdevinfo);
ef524a2229b717 Koichiro Den 2025-02-16 60 if (IS_ERR(pdev)) {
ef524a2229b717 Koichiro Den 2025-02-16 61 bus_unregister_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 @62 kfree(common->name);
ef524a2229b717 Koichiro Den 2025-02-16 63 return PTR_ERR(pdev);
ef524a2229b717 Koichiro Den 2025-02-16 64 }
ef524a2229b717 Koichiro Den 2025-02-16 65
ef524a2229b717 Koichiro Den 2025-02-16 66 wait_for_completion(&common->probe_completion);
ef524a2229b717 Koichiro Den 2025-02-16 67 bus_unregister_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 68
ef524a2229b717 Koichiro Den 2025-02-16 69 if (!common->driver_bound) {
ef524a2229b717 Koichiro Den 2025-02-16 70 platform_device_unregister(pdev);
ef524a2229b717 Koichiro Den 2025-02-16 71 kfree(common->name);
ef524a2229b717 Koichiro Den 2025-02-16 72 return -ENXIO;
ef524a2229b717 Koichiro Den 2025-02-16 73 }
ef524a2229b717 Koichiro Den 2025-02-16 74
ef524a2229b717 Koichiro Den 2025-02-16 75 common->pdev = pdev;
ef524a2229b717 Koichiro Den 2025-02-16 76 return 0;
ef524a2229b717 Koichiro Den 2025-02-16 77 }
ef524a2229b717 Koichiro Den 2025-02-16 78 EXPORT_SYMBOL_GPL(pseudo_gpio_register);
ef524a2229b717 Koichiro Den 2025-02-16 79
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Koichiro,
kernel test robot noticed the following build errors:
[auto build test ERROR on brgl/gpio/for-next]
[also build test ERROR on linus/master v6.14-rc2 next-20250214]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Koichiro-Den/gpio-aggregator-reorder-functions-to-prepare-for-configfs-introduction/20250216-210413
base: https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio/for-next
patch link: https://lore.kernel.org/r/20250216125816.14430-6-koichiro.den%40canonical.com
patch subject: [PATCH v3 05/13] gpio: virtuser: convert to use gpio-pseudo utilities
config: csky-randconfig-002-20250216 (https://download.01.org/0day-ci/archive/20250216/202502162345.FT5z7kr9-lkp@intel.com/config)
compiler: csky-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250216/202502162345.FT5z7kr9-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502162345.FT5z7kr9-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/gpio/gpio-pseudo.c: In function 'pseudo_gpio_register':
>> drivers/gpio/gpio-pseudo.c:62:17: error: implicit declaration of function 'kfree'; did you mean 'kvfree'? [-Wimplicit-function-declaration]
62 | kfree(common->name);
| ^~~~~
| kvfree
vim +62 drivers/gpio/gpio-pseudo.c
ef524a2229b717 Koichiro Den 2025-02-16 43
ef524a2229b717 Koichiro Den 2025-02-16 44 int pseudo_gpio_register(struct pseudo_gpio_common *common,
ef524a2229b717 Koichiro Den 2025-02-16 45 struct platform_device_info *pdevinfo)
ef524a2229b717 Koichiro Den 2025-02-16 46 {
ef524a2229b717 Koichiro Den 2025-02-16 47 struct platform_device *pdev;
ef524a2229b717 Koichiro Den 2025-02-16 48 char *name;
ef524a2229b717 Koichiro Den 2025-02-16 49
ef524a2229b717 Koichiro Den 2025-02-16 50 name = kasprintf(GFP_KERNEL, "%s.%u", pdevinfo->name, pdevinfo->id);
ef524a2229b717 Koichiro Den 2025-02-16 51 if (!name)
ef524a2229b717 Koichiro Den 2025-02-16 52 return -ENOMEM;
ef524a2229b717 Koichiro Den 2025-02-16 53
ef524a2229b717 Koichiro Den 2025-02-16 54 common->driver_bound = false;
ef524a2229b717 Koichiro Den 2025-02-16 55 common->name = name;
ef524a2229b717 Koichiro Den 2025-02-16 56 reinit_completion(&common->probe_completion);
ef524a2229b717 Koichiro Den 2025-02-16 57 bus_register_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 58
ef524a2229b717 Koichiro Den 2025-02-16 59 pdev = platform_device_register_full(pdevinfo);
ef524a2229b717 Koichiro Den 2025-02-16 60 if (IS_ERR(pdev)) {
ef524a2229b717 Koichiro Den 2025-02-16 61 bus_unregister_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 @62 kfree(common->name);
ef524a2229b717 Koichiro Den 2025-02-16 63 return PTR_ERR(pdev);
ef524a2229b717 Koichiro Den 2025-02-16 64 }
ef524a2229b717 Koichiro Den 2025-02-16 65
ef524a2229b717 Koichiro Den 2025-02-16 66 wait_for_completion(&common->probe_completion);
ef524a2229b717 Koichiro Den 2025-02-16 67 bus_unregister_notifier(&platform_bus_type, &common->bus_notifier);
ef524a2229b717 Koichiro Den 2025-02-16 68
ef524a2229b717 Koichiro Den 2025-02-16 69 if (!common->driver_bound) {
ef524a2229b717 Koichiro Den 2025-02-16 70 platform_device_unregister(pdev);
ef524a2229b717 Koichiro Den 2025-02-16 71 kfree(common->name);
ef524a2229b717 Koichiro Den 2025-02-16 72 return -ENXIO;
ef524a2229b717 Koichiro Den 2025-02-16 73 }
ef524a2229b717 Koichiro Den 2025-02-16 74
ef524a2229b717 Koichiro Den 2025-02-16 75 common->pdev = pdev;
ef524a2229b717 Koichiro Den 2025-02-16 76 return 0;
ef524a2229b717 Koichiro Den 2025-02-16 77 }
ef524a2229b717 Koichiro Den 2025-02-16 78 EXPORT_SYMBOL_GPL(pseudo_gpio_register);
ef524a2229b717 Koichiro Den 2025-02-16 79
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.