Skip to contentSkip to conversation

gpio: zevio: Remove duplicate assignment of of_gpio_n_cells

PATCH Applied Andy Shevchenko 2 participants 4 messages Jan 12, 2023 – Jan 16, 2023 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gpio: zevio: Remove duplicate assignment of of_gpio_n_cells

The of_gpio_n_cells default is 2 when ->of_xlate() callback is not defined. No need to assign it explicitly in the driver.

---
 drivers/gpio/gpio-zevio.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpio/gpio-zevio.c +0 -1
index ce9d1282165c..c9f4c26cae3d 100644
@@ -162,7 +162,6 @@ static const struct gpio_chip zevio_gpio_chip = {
 	.base			= 0,
 	.owner			= THIS_MODULE,
 	.ngpio			= 32,
-	.of_gpio_n_cells	= 2,
 };
 
 /* Initialization */
Signature · 1 line
2.39.0
#1 lore raw

PATCH 2/2 gpio: zevio: Use proper headers and drop OF_GPIO dependency

The driver doesn't depend on the OF_GPIO to be compiled. Hence the proper header to use is mod_devicetable.h. Replace of*.h with the above mentioned and drop redundant dependency.

---
 drivers/gpio/Kconfig      | 2 +-
 drivers/gpio/gpio-zevio.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpio/Kconfig +1 -1
index 3b2078a654ce..a2f64f880163 100644
@@ -751,7 +751,7 @@ config GPIO_XTENSA
 
 config GPIO_ZEVIO
 	bool "LSI ZEVIO SoC memory mapped GPIOs"
-	depends on ARM && OF_GPIO
+	depends on ARM
 	help
 	  Say yes here to support the GPIO controller in LSI ZEVIO SoCs.
 
drivers/gpio/gpio-zevio.c +4 -3
index c9f4c26cae3d..61e47456c33a 100644
@@ -5,13 +5,14 @@
  * Author: Fabian Vogt <[email protected]>
  */
 
-#include <linux/spinlock.h>
+#include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/bitops.h>
 #include <linux/io.h>
-#include <linux/of_device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
+
 #include <linux/gpio/driver.h>
 
 /*
Signature · 1 line
2.39.0
#2 lore raw

Re: [PATCH v1 2/2] gpio: zevio: Use proper headers and drop OF_GPIO dependency

Quoted 47 lines · Andy Shevchenko

The driver doesn't depend on the OF_GPIO to be compiled. Hence the proper header to use is mod_devicetable.h. Replace of*.h with the above mentioned and drop redundant dependency.

---
 drivers/gpio/Kconfig      | 2 +-
 drivers/gpio/gpio-zevio.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpio/Kconfig +1 -1
index 3b2078a654ce..a2f64f880163 100644
@@ -751,7 +751,7 @@ config GPIO_XTENSA
 
 config GPIO_ZEVIO
        bool "LSI ZEVIO SoC memory mapped GPIOs"
-       depends on ARM && OF_GPIO
+       depends on ARM
        help
          Say yes here to support the GPIO controller in LSI ZEVIO SoCs.
 
drivers/gpio/gpio-zevio.c +4 -4
index c9f4c26cae3d..61e47456c33a 100644
@@ -5,13 +5,14 @@
  * Author: Fabian Vogt <[email protected]>
  */
 
-#include <linux/spinlock.h>
+#include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/bitops.h>
 #include <linux/io.h>
-#include <linux/of_device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
+
 #include <linux/gpio/driver.h>
 
 /*
--
Quoted 2 lines

2.39.0

Applied, thanks!

Bart

#3 lore raw
In reply to Andy Shevchenko
Quoted 22 lines · Andy Shevchenko

The of_gpio_n_cells default is 2 when ->of_xlate() callback is not defined. No need to assign it explicitly in the driver.

---
 drivers/gpio/gpio-zevio.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpio/gpio-zevio.c +0 -2
index ce9d1282165c..c9f4c26cae3d 100644
@@ -162,7 +162,6 @@ static const struct gpio_chip zevio_gpio_chip = {
        .base                   = 0,
        .owner                  = THIS_MODULE,
        .ngpio                  = 32,
-       .of_gpio_n_cells        = 2,
 };
 
 /* Initialization */
--
Quoted 2 lines

2.39.0

Applied, thanks!

Bart