2023-01-12 19:27:36

by Andy Shevchenko

Subject: [PATCH v1 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.

Signed-off-by: Andy Shevchenko <[email protected]>
---
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"
--
2.39.0

2023-01-12 19:56:53

by Baruch Siach

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

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 <[email protected]>

Acked-by: Baruch Siach <[email protected]>

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"


--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -

2023-01-16 14:35:29

by Linus Walleij

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

On Thu, Jan 12, 2023 at 7:48 PM Andy Shevchenko
<[email protected]> 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 <[email protected]>

Both patches applied!

Yours,
Linus Walleij