[PATCH 0/5] Remove acpi.h implicit include of of.h

[PATCH 0/5] Remove acpi.h implicit include of of.h

[Rob Herring]

In the process of cleaning up DT includes, I found that some drivers 
using DT functions could build without any explicit DT include. I traced 
the include to be coming from acpi.h via irqdomain.h.

I was pleasantly surprised that there were not 100s or even 10s of 
warnings when breaking the include chain. So here's the resulting 
series.

I'd suggest Rafael take the whole series. Alternatively,the fixes can be 
applied in 6.4 and then the last patch either after rc1 or the 
following cycle.

Signed-off-by: Rob Herring <robh@kernel.org>
---
Rob Herring (5):
      iio: adc: ad7292: Add explicit include for of.h
      staging: iio: resolver: ad2s1210: Add explicit include for of.h
      net: rfkill-gpio: Add explicit include for of.h
      serial: 8250_tegra: Add explicit include for of.h
      ACPI: Replace irqdomain.h include with struct declarations

 drivers/iio/adc/ad7292.c                | 1 +
 drivers/staging/iio/resolver/ad2s1210.c | 1 +
 drivers/tty/serial/8250/8250_tegra.c    | 1 +
 include/linux/acpi.h                    | 4 +++-
 net/rfkill/rfkill-gpio.c                | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)
---
base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6
change-id: 20230329-acpi-header-cleanup-665331828436

Best regards,
-- 
Rob Herring <robh@kernel.org>

[PATCH 1/5] iio: adc: ad7292: Add explicit include for of.h

[Rob Herring]

With linux/acpi.h no longer implicitly including of.h, add an explicit
include of of.h to fix the following error:

drivers/iio/adc/ad7292.c:307:9: error: implicit declaration of function 'for_each_available_child_of_node'; did you mean 'fwnode_for_each_available_child_node'? [-Werror=implicit-function-declaration]

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/iio/adc/ad7292.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iio/adc/ad7292.c b/drivers/iio/adc/ad7292.c
index a2f9fda25ff3..cccacec5db6d 100644
--- a/drivers/iio/adc/ad7292.c
+++ b/drivers/iio/adc/ad7292.c
@@ -8,6 +8,7 @@
 #include <linux/bitfield.h>
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 

-- 
2.39.2

[PATCH 2/5] staging: iio: resolver: ad2s1210: Add explicit include for of.h

[Rob Herring]

With linux/acpi.h no longer implicitly including of.h, add an explicit
include of of.h to fix the following error:

drivers/staging/iio/resolver/ad2s1210.c:706:21: error: implicit declaration of function 'of_match_ptr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/staging/iio/resolver/ad2s1210.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index e4cf42438487..eb364639fa58 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -7,6 +7,7 @@
 #include <linux/types.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/of.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>

-- 
2.39.2

[PATCH 3/5] net: rfkill-gpio: Add explicit include for of.h

[Rob Herring]

With linux/acpi.h no longer implicitly including of.h, add an explicit
include of of.h to fix the following error:

net/rfkill/rfkill-gpio.c:181:21: error: implicit declaration of function 'of_match_ptr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

Signed-off-by: Rob Herring <robh@kernel.org>
---
 net/rfkill/rfkill-gpio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 786dbfdad772..e9d1b2f2ff0a 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/rfkill.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/slab.h>

-- 
2.39.2

[PATCH 4/5] serial: 8250_tegra: Add explicit include for of.h

[Rob Herring]

With linux/acpi.h no longer implicitly including of.h, add an explicit
include of of.h to fix the following error:

drivers/tty/serial/8250/8250_tegra.c:68:15: error: implicit declaration of function 'of_alias_get_id' [-Werror=implicit-function-declaration]

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/tty/serial/8250/8250_tegra.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/8250/8250_tegra.c b/drivers/tty/serial/8250/8250_tegra.c
index e7cddeec9d8e..2509e7f74ccf 100644
--- a/drivers/tty/serial/8250/8250_tegra.c
+++ b/drivers/tty/serial/8250/8250_tegra.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/reset.h>
 #include <linux/slab.h>
 

-- 
2.39.2

[PATCH 5/5] ACPI: Replace irqdomain.h include with struct declarations

[Rob Herring]

linux/acpi.h includes irqdomain.h which includes of.h. Break the include
chain by replacing the irqdomain include with forward declarations for
struct irq_domain and irq_domain_ops which is sufficient for acpi.h.

Cc: Marc Zyngier <maz@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
---
 include/linux/acpi.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index efff750f326d..169c17c0b0dc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -10,12 +10,14 @@
 
 #include <linux/errno.h>
 #include <linux/ioport.h>	/* for struct resource */
-#include <linux/irqdomain.h>
 #include <linux/resource_ext.h>
 #include <linux/device.h>
 #include <linux/property.h>
 #include <linux/uuid.h>
 
+struct irq_domain;
+struct irq_domain_ops;
+
 #ifndef _LINUX
 #define _LINUX
 #endif

-- 
2.39.2

Re: [PATCH 3/5] net: rfkill-gpio: Add explicit include for of.h

[Johannes Berg]

On Wed, 2023-03-29 at 16:20 -0500, Rob Herring wrote:
> With linux/acpi.h no longer implicitly including of.h, add an explicit
> include of of.h to fix the following error:
> 
> net/rfkill/rfkill-gpio.c:181:21: error: implicit declaration of function 'of_match_ptr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
> 
> Signed-off-by: Rob Herring <robh@kernel.org>

Sounds good!

Acked-by: Johannes Berg <johannes@sipsolutions.net>

I'm happy with Rafael taking the entire series, there's nothing here
that I expect to conflict, and anyway it'd be trivial.

Thanks,
johannes

RE: [PATCH 0/5] Remove acpi.h implicit include of of.h

[Keller, Jacob E]

> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: Wednesday, March 29, 2023 2:21 PM
> To: Rafael J. Wysocki <rafael@kernel.org>; Len Brown <lenb@kernel.org>;
> Marcelo Schmitt <marcelo.schmitt1@gmail.com>; Lars-Peter Clausen
> <lars@metafoo.de>; Michael Hennerich <Michael.Hennerich@analog.com>;
> Jonathan Cameron <jic23@kernel.org>; Greg Kroah-Hartman
> <gregkh@linuxfoundation.org>; Johannes Berg <johannes@sipsolutions.net>;
> David S. Miller <davem@davemloft.net>; Eric Dumazet
> <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni
> <pabeni@redhat.com>; Jiri Slaby <jirislaby@kernel.org>; Thierry Reding
> <thierry.reding@gmail.com>; Jonathan Hunter <jonathanh@nvidia.com>; Marc
> Zyngier <maz@kernel.org>
> Cc: linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org; linux-
> staging@lists.linux.dev; linux-wireless@vger.kernel.org;
> netdev@vger.kernel.org; linux-serial@vger.kernel.org; linux-
> tegra@vger.kernel.org; linux-acpi@vger.kernel.org; devicetree@vger.kernel.org
> Subject: [PATCH 0/5] Remove acpi.h implicit include of of.h
> 
> In the process of cleaning up DT includes, I found that some drivers
> using DT functions could build without any explicit DT include. I traced
> the include to be coming from acpi.h via irqdomain.h.
> 
> I was pleasantly surprised that there were not 100s or even 10s of
> warnings when breaking the include chain. So here's the resulting
> series.
> 
> I'd suggest Rafael take the whole series. Alternatively,the fixes can be
> applied in 6.4 and then the last patch either after rc1 or the
> following cycle.
> 

Nice that there aren't too many errors. Use of the forward declarations makes sense rather than including a bunch of unrelated definitions. Nice.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>

Thanks,
Jake

> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> Rob Herring (5):
>       iio: adc: ad7292: Add explicit include for of.h
>       staging: iio: resolver: ad2s1210: Add explicit include for of.h
>       net: rfkill-gpio: Add explicit include for of.h
>       serial: 8250_tegra: Add explicit include for of.h
>       ACPI: Replace irqdomain.h include with struct declarations
> 
>  drivers/iio/adc/ad7292.c                | 1 +
>  drivers/staging/iio/resolver/ad2s1210.c | 1 +
>  drivers/tty/serial/8250/8250_tegra.c    | 1 +
>  include/linux/acpi.h                    | 4 +++-
>  net/rfkill/rfkill-gpio.c                | 1 +
>  5 files changed, 7 insertions(+), 1 deletion(-)
> ---
> base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6
> change-id: 20230329-acpi-header-cleanup-665331828436
> 
> Best regards,
> --
> Rob Herring <robh@kernel.org>

Re: [PATCH 1/5] iio: adc: ad7292: Add explicit include for of.h

[Marcelo Schmitt]

On 03/29, Rob Herring wrote:
> With linux/acpi.h no longer implicitly including of.h, add an explicit
> include of of.h to fix the following error:
> 
> drivers/iio/adc/ad7292.c:307:9: error: implicit declaration of function 'for_each_available_child_of_node'; did you mean 'fwnode_for_each_available_child_node'? [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Rob Herring <robh@kernel.org>

Acked-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>

Thanks,
Marcelo

> ---
>  drivers/iio/adc/ad7292.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/iio/adc/ad7292.c b/drivers/iio/adc/ad7292.c
> index a2f9fda25ff3..cccacec5db6d 100644
> --- a/drivers/iio/adc/ad7292.c
> +++ b/drivers/iio/adc/ad7292.c
> @@ -8,6 +8,7 @@
>  #include <linux/bitfield.h>
>  #include <linux/device.h>
>  #include <linux/module.h>
> +#include <linux/of.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/spi/spi.h>
>  
> 
> -- 
> 2.39.2
> 

Re: [PATCH 0/5] Remove acpi.h implicit include of of.h

[Greg Kroah-Hartman]

On Wed, Mar 29, 2023 at 04:20:41PM -0500, Rob Herring wrote:
> In the process of cleaning up DT includes, I found that some drivers 
> using DT functions could build without any explicit DT include. I traced 
> the include to be coming from acpi.h via irqdomain.h.
> 
> I was pleasantly surprised that there were not 100s or even 10s of 
> warnings when breaking the include chain. So here's the resulting 
> series.
> 
> I'd suggest Rafael take the whole series. Alternatively,the fixes can be 
> applied in 6.4 and then the last patch either after rc1 or the 
> following cycle.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>

Nice cleanup, all are:

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH 1/5] iio: adc: ad7292: Add explicit include for of.h

[Jonathan Cameron]

On Wed, 29 Mar 2023 22:10:55 -0300
Marcelo Schmitt <marcelo.schmitt1@gmail.com> wrote:

> On 03/29, Rob Herring wrote:
> > With linux/acpi.h no longer implicitly including of.h, add an explicit
> > include of of.h to fix the following error:
> > 
> > drivers/iio/adc/ad7292.c:307:9: error: implicit declaration of function 'for_each_available_child_of_node'; did you mean 'fwnode_for_each_available_child_node'? [-Werror=implicit-function-declaration]
> > 
> > Signed-off-by: Rob Herring <robh@kernel.org>  
> 
> Acked-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> 
> Thanks,
> Marcelo
> 
> > ---
> >  drivers/iio/adc/ad7292.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/iio/adc/ad7292.c b/drivers/iio/adc/ad7292.c
> > index a2f9fda25ff3..cccacec5db6d 100644
> > --- a/drivers/iio/adc/ad7292.c
> > +++ b/drivers/iio/adc/ad7292.c
> > @@ -8,6 +8,7 @@
> >  #include <linux/bitfield.h>
> >  #include <linux/device.h>
> >  #include <linux/module.h>
> > +#include <linux/of.h>
> >  #include <linux/regulator/consumer.h>
> >  #include <linux/spi/spi.h>
> >  
> > 
> > -- 
> > 2.39.2
> >   

Re: [PATCH 2/5] staging: iio: resolver: ad2s1210: Add explicit include for of.h

[Jonathan Cameron]

On Wed, 29 Mar 2023 16:20:43 -0500
Rob Herring <robh@kernel.org> wrote:

> With linux/acpi.h no longer implicitly including of.h, add an explicit
> include of of.h to fix the following error:
> 
> drivers/staging/iio/resolver/ad2s1210.c:706:21: error: implicit declaration of function 'of_match_ptr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  drivers/staging/iio/resolver/ad2s1210.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
> index e4cf42438487..eb364639fa58 100644
> --- a/drivers/staging/iio/resolver/ad2s1210.c
> +++ b/drivers/staging/iio/resolver/ad2s1210.c
> @@ -7,6 +7,7 @@
>  #include <linux/types.h>
>  #include <linux/mutex.h>
>  #include <linux/device.h>
> +#include <linux/of.h>
>  #include <linux/spi/spi.h>
>  #include <linux/slab.h>
>  #include <linux/sysfs.h>
> 

Re: [PATCH 4/5] serial: 8250_tegra: Add explicit include for of.h

[Jon Hunter]

On 29/03/2023 22:20, Rob Herring wrote:
> With linux/acpi.h no longer implicitly including of.h, add an explicit
> include of of.h to fix the following error:
> 
> drivers/tty/serial/8250/8250_tegra.c:68:15: error: implicit declaration of function 'of_alias_get_id' [-Werror=implicit-function-declaration]
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>   drivers/tty/serial/8250/8250_tegra.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/tty/serial/8250/8250_tegra.c b/drivers/tty/serial/8250/8250_tegra.c
> index e7cddeec9d8e..2509e7f74ccf 100644
> --- a/drivers/tty/serial/8250/8250_tegra.c
> +++ b/drivers/tty/serial/8250/8250_tegra.c
> @@ -11,6 +11,7 @@
>   #include <linux/delay.h>
>   #include <linux/io.h>
>   #include <linux/module.h>
> +#include <linux/of.h>
>   #include <linux/reset.h>
>   #include <linux/slab.h>
>   
> 


Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Thanks!
Jon

-- 
nvpublic

Re: [PATCH 0/5] Remove acpi.h implicit include of of.h

[Rafael J. Wysocki]

On Thu, Mar 30, 2023 at 8:13 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Wed, Mar 29, 2023 at 04:20:41PM -0500, Rob Herring wrote:
> > In the process of cleaning up DT includes, I found that some drivers
> > using DT functions could build without any explicit DT include. I traced
> > the include to be coming from acpi.h via irqdomain.h.
> >
> > I was pleasantly surprised that there were not 100s or even 10s of
> > warnings when breaking the include chain. So here's the resulting
> > series.
> >
> > I'd suggest Rafael take the whole series. Alternatively,the fixes can be
> > applied in 6.4 and then the last patch either after rc1 or the
> > following cycle.
> >
> > Signed-off-by: Rob Herring <robh@kernel.org>
>
> Nice cleanup, all are:
>
> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

All applied as 6.4 material with the tags collected so far, thanks!

Re: [PATCH 5/5] ACPI: Replace irqdomain.h include with struct declarations

[Rafael J. Wysocki]

Hi Rob,

On Wed, Mar 29, 2023 at 11:21 PM Rob Herring <robh@kernel.org> wrote:
>
> linux/acpi.h includes irqdomain.h which includes of.h. Break the include
> chain by replacing the irqdomain include with forward declarations for
> struct irq_domain and irq_domain_ops which is sufficient for acpi.h.
>
> Cc: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  include/linux/acpi.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index efff750f326d..169c17c0b0dc 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -10,12 +10,14 @@
>
>  #include <linux/errno.h>
>  #include <linux/ioport.h>      /* for struct resource */
> -#include <linux/irqdomain.h>
>  #include <linux/resource_ext.h>
>  #include <linux/device.h>
>  #include <linux/property.h>
>  #include <linux/uuid.h>
>
> +struct irq_domain;
> +struct irq_domain_ops;
> +
>  #ifndef _LINUX
>  #define _LINUX
>  #endif
>
> --

This causes build issues in linux-next, so I've dropped the series.  I
will be happy to pick it up again when the build issues are addressed,
though.

Thanks!

Re: [PATCH 5/5] ACPI: Replace irqdomain.h include with struct declarations

[Rob Herring]

On Wed, Apr 5, 2023 at 9:59 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> Hi Rob,
>
> On Wed, Mar 29, 2023 at 11:21 PM Rob Herring <robh@kernel.org> wrote:
> >
> > linux/acpi.h includes irqdomain.h which includes of.h. Break the include
> > chain by replacing the irqdomain include with forward declarations for
> > struct irq_domain and irq_domain_ops which is sufficient for acpi.h.
> >
> > Cc: Marc Zyngier <maz@kernel.org>
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> >  include/linux/acpi.h | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > index efff750f326d..169c17c0b0dc 100644
> > --- a/include/linux/acpi.h
> > +++ b/include/linux/acpi.h
> > @@ -10,12 +10,14 @@
> >
> >  #include <linux/errno.h>
> >  #include <linux/ioport.h>      /* for struct resource */
> > -#include <linux/irqdomain.h>
> >  #include <linux/resource_ext.h>
> >  #include <linux/device.h>
> >  #include <linux/property.h>
> >  #include <linux/uuid.h>
> >
> > +struct irq_domain;
> > +struct irq_domain_ops;
> > +
> >  #ifndef _LINUX
> >  #define _LINUX
> >  #endif
> >
> > --
>
> This causes build issues in linux-next, so I've dropped the series.  I
> will be happy to pick it up again when the build issues are addressed,
> though.

Is it just the one in pata_macio.c or are there others you are aware of?

Rob

Re: [PATCH 5/5] ACPI: Replace irqdomain.h include with struct declarations

[Rafael J. Wysocki]

On Wed, Apr 5, 2023 at 6:48 PM Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Apr 5, 2023 at 9:59 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> >
> > Hi Rob,
> >
> > On Wed, Mar 29, 2023 at 11:21 PM Rob Herring <robh@kernel.org> wrote:
> > >
> > > linux/acpi.h includes irqdomain.h which includes of.h. Break the include
> > > chain by replacing the irqdomain include with forward declarations for
> > > struct irq_domain and irq_domain_ops which is sufficient for acpi.h.
> > >
> > > Cc: Marc Zyngier <maz@kernel.org>
> > > Signed-off-by: Rob Herring <robh@kernel.org>
> > > ---
> > >  include/linux/acpi.h | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > > index efff750f326d..169c17c0b0dc 100644
> > > --- a/include/linux/acpi.h
> > > +++ b/include/linux/acpi.h
> > > @@ -10,12 +10,14 @@
> > >
> > >  #include <linux/errno.h>
> > >  #include <linux/ioport.h>      /* for struct resource */
> > > -#include <linux/irqdomain.h>
> > >  #include <linux/resource_ext.h>
> > >  #include <linux/device.h>
> > >  #include <linux/property.h>
> > >  #include <linux/uuid.h>
> > >
> > > +struct irq_domain;
> > > +struct irq_domain_ops;
> > > +
> > >  #ifndef _LINUX
> > >  #define _LINUX
> > >  #endif
> > >
> > > --
> >
> > This causes build issues in linux-next, so I've dropped the series.  I
> > will be happy to pick it up again when the build issues are addressed,
> > though.
>
> Is it just the one in pata_macio.c or are there others you are aware of?

I'm aware of a few:

https://lore.kernel.org/lkml/20230403201801.02839c9a@canb.auug.org.au/
https://lore.kernel.org/lkml/20230403112514.47ff91bb@canb.auug.org.au/
https://lore.kernel.org/lkml/20230403111605.7658ec62@canb.auug.org.au/
https://lore.kernel.org/lkml/20230403110650.6b13cb71@canb.auug.org.au/