Skip to contentSkip to conversation

gpiolib: legacy: Consolidate devm_gpio_*() with other legacy APIs

PATCH Applied Andy Shevchenko 2 participants 2 messages Aug 28, 2024 – Sep 2, 2024 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 gpiolib: legacy: Consolidate devm_gpio_*() with other legacy APIs

There is no reason to keep deprecated legacy API implementations in the gpiolib-devres.c. Consolidate devm_gpio_*() with other legacy APIs. While at it, clean up header inclusion block in gpiolib-devres.c.

---
v2: rebased on top of next-20240828

 drivers/gpio/gpiolib-devres.c | 82 ++++-----------------------------
 drivers/gpio/gpiolib-legacy.c | 86 +++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 74 deletions(-)
drivers/gpio/gpiolib-devres.c +8 -74
index 4987e62dcb3d..b063f466a4d6 100644
@@ -6,15 +6,19 @@
  * Copyright (c) 2011 John Crispin <[email protected]>
  */
 
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/gpio.h>
-#include <linux/gpio/consumer.h>
 #include <linux/device.h>
+#include <linux/err.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
+#include <linux/types.h>
+
+#include <linux/gpio/consumer.h>
 
 #include "gpiolib.h"
 
+struct fwnode_handle;
+struct lock_class_key;
+
 static void devm_gpiod_release(struct device *dev, void *res)
 {
 	struct gpio_desc **desc = res;
@@ -320,76 +324,6 @@ void devm_gpiod_put_array(struct device *dev, struct gpio_descs *descs)
 }
 EXPORT_SYMBOL_GPL(devm_gpiod_put_array);
 
-static void devm_gpio_release(struct device *dev, void *res)
-{
-	unsigned *gpio = res;
-
-	gpio_free(*gpio);
-}
-
-/**
- *      devm_gpio_request - request a GPIO for a managed device
- *      @dev: device to request the GPIO for
- *      @gpio: GPIO to allocate
- *      @label: the name of the requested GPIO
- *
- *      Except for the extra @dev argument, this function takes the
- *      same arguments and performs the same function as
- *      gpio_request().  GPIOs requested with this function will be
- *      automatically freed on driver detach.
- */
-int devm_gpio_request(struct device *dev, unsigned gpio, const char *label)
-{
-	unsigned *dr;
-	int rc;
-
-	dr = devres_alloc(devm_gpio_release, sizeof(unsigned), GFP_KERNEL);
-	if (!dr)
-		return -ENOMEM;
-
-	rc = gpio_request(gpio, label);
-	if (rc) {
-		devres_free(dr);
-		return rc;
-	}
-
-	*dr = gpio;
-	devres_add(dev, dr);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(devm_gpio_request);
-
-/**
- *	devm_gpio_request_one - request a single GPIO with initial setup
- *	@dev:   device to request for
- *	@gpio:	the GPIO number
- *	@flags:	GPIO configuration as specified by GPIOF_*
- *	@label:	a literal description string of this GPIO
- */
-int devm_gpio_request_one(struct device *dev, unsigned gpio,
-			  unsigned long flags, const char *label)
-{
-	unsigned *dr;
-	int rc;
-
-	dr = devres_alloc(devm_gpio_release, sizeof(unsigned), GFP_KERNEL);
-	if (!dr)
-		return -ENOMEM;
-
-	rc = gpio_request_one(gpio, flags, label);
-	if (rc) {
-		devres_free(dr);
-		return rc;
-	}
-
-	*dr = gpio;
-	devres_add(dev, dr);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(devm_gpio_request_one);
-
 static void devm_gpio_chip_release(void *data)
 {
 	struct gpio_chip *gc = data;
drivers/gpio/gpiolib-legacy.c +86 -0

93 lines not on this page · raw message

Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#1 lore raw

From: Bartosz Golaszewski <[email protected]>

Quoted 5 lines · Andy Shevchenko

There is no reason to keep deprecated legacy API implementations in the gpiolib-devres.c. Consolidate devm_gpio_*() with other legacy APIs. While at it, clean up header inclusion block in gpiolib-devres.c.

Applied, thanks!

[1/1] gpiolib: legacy: Consolidate devm_gpio_*() with other legacy APIs

      commit: ef2753797e31a126ead23258d73fd8d979679e81

Best regards,

Signature · 1 line
Bartosz Golaszewski <[email protected]>