Skip to contentSkip to conversation

pinctrl: digicolor: Remove duplicate assignment of of_gpio_n_cells

PATCH In review Andy Shevchenko 3 participants 5 messages Jan 12, 2023 – Jan 16, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pinctrl: digicolor: 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/pinctrl/pinctrl-digicolor.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pinctrl/pinctrl-digicolor.c +0 -1
index cc3546fc4610..05213261b8a4 100644
@@ -248,7 +248,6 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap)
 	chip->set		= dc_gpio_set;
 	chip->base		= -1;
 	chip->ngpio		= PINS_COUNT;
-	chip->of_gpio_n_cells	= 2;
 
 	spin_lock_init(&pmap->lock);
 
Signature · 7 lines
2.39.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH 2/2 pinctrl: digicolor: Use proper headers and drop OF dependency

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

---
 drivers/pinctrl/Kconfig             | 2 +-
 drivers/pinctrl/pinctrl-digicolor.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/pinctrl/Kconfig +1 -1
index 476f3cbbdce0..1e44708201ad 100644
@@ -170,7 +170,7 @@ config PINCTRL_DA9062
 
 config PINCTRL_DIGICOLOR
 	bool
-	depends on OF && (ARCH_DIGICOLOR || COMPILE_TEST)
+	depends on ARCH_DIGICOLOR || COMPILE_TEST
 	select PINMUX
 	select GENERIC_PINCONF
 
drivers/pinctrl/pinctrl-digicolor.c +5 -4
index 05213261b8a4..a0423172bdd6 100644
@@ -11,18 +11,19 @@
  * - Pin pad configuration (pull up/down, strength)
  */
 
+#include <linux/gpio/driver.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/io.h>
-#include <linux/gpio/driver.h>
+#include <linux/mod_devicetable.h>
+#include <linux/platform_device.h>
 #include <linux/spinlock.h>
+
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
+
 #include "pinctrl-utils.h"
 
 #define DRIVER_NAME	"pinctrl-digicolor"
Signature · 7 lines
2.39.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Acked-by on v1 2/2
#2 lore raw

Re: [PATCH v1 2/2] pinctrl: digicolor: Use proper headers and drop OF dependency

Hi Andy,

Quoted 5 lines · Andy Shevchenko

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

baruch

Quoted 46 lines
---
 drivers/pinctrl/Kconfig             | 2 +-
 drivers/pinctrl/pinctrl-digicolor.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/pinctrl/Kconfig +1 -1
index 476f3cbbdce0..1e44708201ad 100644
@@ -170,7 +170,7 @@ config PINCTRL_DA9062
 
 config PINCTRL_DIGICOLOR
 	bool
-	depends on OF && (ARCH_DIGICOLOR || COMPILE_TEST)
+	depends on ARCH_DIGICOLOR || COMPILE_TEST
 	select PINMUX
 	select GENERIC_PINCONF
 
drivers/pinctrl/pinctrl-digicolor.c +5 -4
index 05213261b8a4..a0423172bdd6 100644
@@ -11,18 +11,19 @@
  * - Pin pad configuration (pull up/down, strength)
  */
 
+#include <linux/gpio/driver.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/io.h>
-#include <linux/gpio/driver.h>
+#include <linux/mod_devicetable.h>
+#include <linux/platform_device.h>
 #include <linux/spinlock.h>
+
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
+
 #include "pinctrl-utils.h"
 
 #define DRIVER_NAME	"pinctrl-digicolor"
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

Re: [PATCH v1 2/2] pinctrl: digicolor: Use proper headers and drop OF dependency

In reply to Andy Shevchenko
Quoted 5 lines · Andy Shevchenko

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

Both patches applied!

Yours,
Linus Walleij

maintainer Acked-by on v1 1/2
#4 lore raw
In reply to Andy Shevchenko

Hi Andy,

Quoted 4 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.

baruch

Quoted 15 lines
---
 drivers/pinctrl/pinctrl-digicolor.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pinctrl/pinctrl-digicolor.c +0 -1
index cc3546fc4610..05213261b8a4 100644
@@ -248,7 +248,6 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap)
 	chip->set		= dc_gpio_set;
 	chip->base		= -1;
 	chip->ngpio		= PINS_COUNT;
-	chip->of_gpio_n_cells	= 2;
 
 	spin_lock_init(&pmap->lock);
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -