kevin/linux
1
Fork 0
Code

gpio: of: Make of_gpio_get_count() take firmware node as a parameter

Browse Source 
Make of_gpio_get_count() take firmware node as a parameter in order
to be aligned with other functions and decouple from unused device
pointer. The latter helps to create a common fwnode_gpio_count()
in the future.

While at it, rename to be of_gpio_count() to be aligned with the others.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Andy Shevchenko 2024-02-29 16:51:38 +02:00 committed by Bartosz Golaszewski
parent 0d776cfd5e
commit adcad5364a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/gpiolib-of.c
View File

@ -68,7 +68,7 @@ static int of_gpio_named_count(const struct device_node *np,
/** /**
* of_gpio_spi_cs_get_count() - special GPIO counting for SPI * of_gpio_spi_cs_get_count() - special GPIO counting for SPI
* @dev: Consuming device * @np: Consuming device node
* @con_id: Function within the GPIO consumer * @con_id: Function within the GPIO consumer
* *
* Some elder GPIO controllers need special quirks. Currently we handle * Some elder GPIO controllers need special quirks. Currently we handle
@ -78,10 +78,9 @@ static int of_gpio_named_count(const struct device_node *np,
* the counting of "cs-gpios" to count "gpios" transparent to the * the counting of "cs-gpios" to count "gpios" transparent to the
* driver. * driver.
*/ */
static int of_gpio_spi_cs_get_count(struct device *dev, const char *con_id) static int of_gpio_spi_cs_get_count(const struct device_node *np,
const char *con_id)
{ {
struct device_node *np = dev->of_node;
if (!IS_ENABLED(CONFIG_SPI_MASTER)) if (!IS_ENABLED(CONFIG_SPI_MASTER))
return 0; return 0;
if (!con_id || strcmp(con_id, "cs")) if (!con_id || strcmp(con_id, "cs"))
@ -93,13 +92,14 @@ static int of_gpio_spi_cs_get_count(struct device *dev, const char *con_id)
return of_gpio_named_count(np, "gpios"); return of_gpio_named_count(np, "gpios");
} }
int of_gpio_get_count(struct device *dev, const char *con_id) int of_gpio_count(const struct fwnode_handle *fwnode, const char *con_id)
{ {
const struct device_node *np = to_of_node(fwnode);
int ret; int ret;
char propname[32]; char propname[32];
unsigned int i; unsigned int i;
ret = of_gpio_spi_cs_get_count(dev, con_id); ret = of_gpio_spi_cs_get_count(np, con_id);
if (ret > 0) if (ret > 0)
return ret; return ret;
@ -111,7 +111,7 @@ int of_gpio_get_count(struct device *dev, const char *con_id)
snprintf(propname, sizeof(propname), "%s", snprintf(propname, sizeof(propname), "%s",
gpio_suffixes[i]); gpio_suffixes[i]);
ret = of_gpio_named_count(dev->of_node, propname); ret = of_gpio_named_count(np, propname);
if (ret > 0) if (ret > 0)
break; break;
} }

6
drivers/gpio/gpiolib-of.h
View File

@ -9,6 +9,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
struct device; struct device;
struct fwnode_handle;
struct gpio_chip; struct gpio_chip;
struct gpio_desc; struct gpio_desc;
@ -21,7 +22,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np,
unsigned long *lookupflags); unsigned long *lookupflags);
int of_gpiochip_add(struct gpio_chip *gc); int of_gpiochip_add(struct gpio_chip *gc);
void of_gpiochip_remove(struct gpio_chip *gc); void of_gpiochip_remove(struct gpio_chip *gc);
int of_gpio_get_count(struct device *dev, const char *con_id); int of_gpio_count(const struct fwnode_handle *fwnode, const char *con_id);
#else #else
static inline struct gpio_desc *of_find_gpio(struct device_node *np, static inline struct gpio_desc *of_find_gpio(struct device_node *np,
const char *con_id, const char *con_id,
@ -32,7 +33,8 @@ static inline struct gpio_desc *of_find_gpio(struct device_node *np,
} }
static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; }
static inline void of_gpiochip_remove(struct gpio_chip *gc) { } static inline void of_gpiochip_remove(struct gpio_chip *gc) { }
static inline int of_gpio_get_count(struct device *dev, const char *con_id) static inline int of_gpio_count(const struct fwnode_handle *fwnode,
const char *con_id)
{ {
return 0; return 0;
} }

2
drivers/gpio/gpiolib.c
View File

@ -4285,7 +4285,7 @@ int gpiod_count(struct device *dev, const char *con_id)
int count = -ENOENT; int count = -ENOENT;
if (is_of_node(fwnode)) if (is_of_node(fwnode))
count = of_gpio_get_count(dev, con_id); count = of_gpio_count(fwnode, con_id);
else if (is_acpi_node(fwnode)) else if (is_acpi_node(fwnode))
count = acpi_gpio_count(dev, con_id); count = acpi_gpio_count(dev, con_id);
else if (is_software_node(fwnode)) else if (is_software_node(fwnode))