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

Message ID 20230112184823.80349-2-andriy.shevchenko@linux.intel.com
State New
Headers
Series [v1,1/2] pinctrl: digicolor: Remove duplicate assignment of of_gpio_n_cells |

Commit Message

Andy Shevchenko Jan. 12, 2023, 6:48 p.m. UTC
  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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/pinctrl/Kconfig             | 2 +-
 drivers/pinctrl/pinctrl-digicolor.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
  

Comments

Baruch Siach Jan. 12, 2023, 7:30 p.m. UTC | #1
Hi Andy,

On Thu, Jan 12 2023, Andy Shevchenko wrote:

> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Acked-by: Baruch Siach <baruch@tkos.co.il>

baruch

> ---
>  drivers/pinctrl/Kconfig             | 2 +-
>  drivers/pinctrl/pinctrl-digicolor.c | 9 +++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 476f3cbbdce0..1e44708201ad 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -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
>  
> diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
> index 05213261b8a4..a0423172bdd6 100644
> --- a/drivers/pinctrl/pinctrl-digicolor.c
> +++ b/drivers/pinctrl/pinctrl-digicolor.c
> @@ -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"
  
Linus Walleij Jan. 16, 2023, 2:06 p.m. UTC | #2
On Thu, Jan 12, 2023 at 7:48 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:

> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Both patches applied!

Yours,
Linus Walleij
  

Patch

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 476f3cbbdce0..1e44708201ad 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -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
 
diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index 05213261b8a4..a0423172bdd6 100644
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -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"