[v4,02/18] ARM: s3c24xx: Use the right include

Commit Message

Andy Shevchenko Feb. 8, 2023, 5:33 p.m. UTC

From: Linus Walleij <[e-mail]>

The file s3c64xx.c is including <linux/gpio.h> despite using no
symbols from the file, however it needs it to implicitly bring in
of_have_populated_dt() so include <linux/of.h> explicitly instead.

Signed-off-by: Linus Walleij <[e-mail]>
Signed-off-by: Andy Shevchenko <[e-mail]>
---
 arch/arm/mach-s3c/s3c64xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Krzysztof Kozlowski Feb. 8, 2023, 5:39 p.m. UTC | #1

On 08/02/2023 18:33, Andy Shevchenko wrote:
> From: Linus Walleij <[e-mail]>
> 
> The file s3c64xx.c is including <linux/gpio.h> despite using no
> symbols from the file, however it needs it to implicitly bring in
> of_have_populated_dt() so include <linux/of.h> explicitly instead.
> 
> Signed-off-by: Linus Walleij <[e-mail]>
> Signed-off-by: Andy Shevchenko <[e-mail]>
> ---
>  arch/arm/mach-s3c/s3c64xx.c | 2 +-

It's not s3c24xx anymore, so subject prefix:
ARM: s3c64xx:


Best regards,
Krzysztof

Andy Shevchenko Feb. 8, 2023, 5:43 p.m. UTC | #2

On Wed, Feb 08, 2023 at 06:39:12PM +0100, Krzysztof Kozlowski wrote:
> On 08/02/2023 18:33, Andy Shevchenko wrote:

...

> It's not s3c24xx anymore, so subject prefix:
> ARM: s3c64xx:

Fixed locally, thanks.

Krzysztof Kozlowski Feb. 8, 2023, 6:02 p.m. UTC | #3

On 08/02/2023 18:33, Andy Shevchenko wrote:
> From: Linus Walleij <[e-mail]>
> 
> The file s3c64xx.c is including <linux/gpio.h> despite using no
> symbols from the file, however it needs it to implicitly bring in
> of_have_populated_dt() so include <linux/of.h> explicitly instead.
> 
> Signed-off-by: Linus Walleij <[e-mail]>
> Signed-off-by: Andy Shevchenko <[e-mail]>


Acked-by: Krzysztof Kozlowski <[e-mail]>

Best regards,
Krzysztof

Linus Walleij Feb. 9, 2023, 10:45 a.m. UTC | #4

On Wed, Feb 8, 2023 at 6:39 PM Krzysztof Kozlowski
<[e-mail]> wrote:

> On 08/02/2023 18:33, Andy Shevchenko wrote:
> > From: Linus Walleij <[e-mail]>
> >
> > The file s3c64xx.c is including <linux/gpio.h> despite using no
> > symbols from the file, however it needs it to implicitly bring in
> > of_have_populated_dt() so include <linux/of.h> explicitly instead.
> >
> > Signed-off-by: Linus Walleij <[e-mail]>
> > Signed-off-by: Andy Shevchenko <[e-mail]>
> > ---
> >  arch/arm/mach-s3c/s3c64xx.c | 2 +-
>
> It's not s3c24xx anymore, so subject prefix:
> ARM: s3c64xx:

My mistake, mea culpa.

Yours,
Linus Walleij

Patch

diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index e97bd59083a8..9f9717874d67 100644
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -21,13 +21,13 @@ 
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
 #include <linux/serial_s3c.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/io.h>
 #include <linux/clk/samsung.h>
 #include <linux/dma-mapping.h>
 #include <linux/irq.h>
-#include <linux/gpio.h>
 #include <linux/irqchip/arm-vic.h>
 #include <clocksource/samsung_pwm.h>