On Fri Jul 14, 2023 at 5:43 PM UTC, Rob Herring wrote: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> > --- > drivers/char/agp/uninorth-agp.c | 1 + > drivers/char/bsr.c | 3 +-- > drivers/char/hw_random/atmel-rng.c | 2 +- > drivers/char/hw_random/bcm2835-rng.c | 3 +-- > drivers/char/hw_random/ingenic-trng.c | 2 +- > drivers/char/hw_random/iproc-rng200.c | 3 +-- > drivers/char/hw_random/npcm-rng.c | 3 +-- > drivers/char/hw_random/omap-rng.c | 2 -- > drivers/char/hw_random/omap3-rom-rng.c | 1 - > drivers/char/hw_random/pasemi-rng.c | 3 +-- > drivers/char/hw_random/pic32-rng.c | 3 +-- > drivers/char/hw_random/stm32-rng.c | 3 ++- > drivers/char/hw_random/xgene-rng.c | 5 ++--- > drivers/char/hw_random/xiphera-trng.c | 1 - > drivers/char/ipmi/kcs_bmc_aspeed.c | 1 - > drivers/char/tpm/tpm_ftpm_tee.c | 1 - > drivers/char/tpm/tpm_tis.c | 1 - > drivers/char/tpm/tpm_tis_spi_main.c | 2 +- > drivers/char/tpm/tpm_tis_synquacer.c | 1 - > 19 files changed, 14 insertions(+), 27 deletions(-) > > diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c > index 62de7f4ba864..84411b13c49f 100644 > --- a/drivers/char/agp/uninorth-agp.c > +++ b/drivers/char/agp/uninorth-agp.c > @@ -3,6 +3,7 @@ > * UniNorth AGPGART routines. > */ > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/pci.h> > #include <linux/slab.h> > #include <linux/init.h> > diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c > index 12143854aeac..70d31aed9011 100644 > --- a/drivers/char/bsr.c > +++ b/drivers/char/bsr.c > @@ -6,11 +6,10 @@ > * Author: Sonny Rao <sonnyrao@xxxxxxxxxx> > */ > > +#include <linux/device.h> > #include <linux/kernel.h> > #include <linux/of.h> > #include <linux/of_address.h> > -#include <linux/of_device.h> > -#include <linux/of_platform.h> > #include <linux/fs.h> > #include <linux/module.h> > #include <linux/cdev.h> > diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c > index b8effe77d80f..a37367ebcbac 100644 > --- a/drivers/char/hw_random/atmel-rng.c > +++ b/drivers/char/hw_random/atmel-rng.c > @@ -15,7 +15,7 @@ > #include <linux/io.h> > #include <linux/iopoll.h> > #include <linux/hw_random.h> > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > > diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c > index e98fcac578d6..e19b0f9f48b9 100644 > --- a/drivers/char/hw_random/bcm2835-rng.c > +++ b/drivers/char/hw_random/bcm2835-rng.c > @@ -8,8 +8,7 @@ > #include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/of_address.h> > -#include <linux/of_platform.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/printk.h> > #include <linux/clk.h> > diff --git a/drivers/char/hw_random/ingenic-trng.c b/drivers/char/hw_random/ingenic-trng.c > index 0eb80f786f4d..759445d4f65a 100644 > --- a/drivers/char/hw_random/ingenic-trng.c > +++ b/drivers/char/hw_random/ingenic-trng.c > @@ -11,8 +11,8 @@ > #include <linux/hw_random.h> > #include <linux/io.h> > #include <linux/iopoll.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c > index 06bc060534d8..34df3f0d3e45 100644 > --- a/drivers/char/hw_random/iproc-rng200.c > +++ b/drivers/char/hw_random/iproc-rng200.c > @@ -12,8 +12,7 @@ > #include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/of_address.h> > -#include <linux/of_platform.h> > +#include <linux/mod_devicetable.h> > #include <linux/platform_device.h> > #include <linux/delay.h> > > diff --git a/drivers/char/hw_random/npcm-rng.c b/drivers/char/hw_random/npcm-rng.c > index 9903d0357e06..8a304b754217 100644 > --- a/drivers/char/hw_random/npcm-rng.c > +++ b/drivers/char/hw_random/npcm-rng.c > @@ -8,12 +8,11 @@ > #include <linux/init.h> > #include <linux/random.h> > #include <linux/err.h> > +#include <linux/of.h> > #include <linux/platform_device.h> > #include <linux/hw_random.h> > #include <linux/delay.h> > -#include <linux/of_irq.h> > #include <linux/pm_runtime.h> > -#include <linux/of_device.h> > > #define NPCM_RNGCS_REG 0x00 /* Control and status register */ > #define NPCM_RNGD_REG 0x04 /* Data register */ > diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c > index 00ff96703dd2..be03f76a2a80 100644 > --- a/drivers/char/hw_random/omap-rng.c > +++ b/drivers/char/hw_random/omap-rng.c > @@ -26,8 +26,6 @@ > #include <linux/slab.h> > #include <linux/pm_runtime.h> > #include <linux/of.h> > -#include <linux/of_device.h> > -#include <linux/of_address.h> > #include <linux/interrupt.h> > #include <linux/clk.h> > #include <linux/io.h> > diff --git a/drivers/char/hw_random/omap3-rom-rng.c b/drivers/char/hw_random/omap3-rom-rng.c > index f06e4f95114f..18dc46b1b58e 100644 > --- a/drivers/char/hw_random/omap3-rom-rng.c > +++ b/drivers/char/hw_random/omap3-rom-rng.c > @@ -20,7 +20,6 @@ > #include <linux/err.h> > #include <linux/io.h> > #include <linux/of.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > > diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c > index 2498d4ef9fe2..6959d6edd44c 100644 > --- a/drivers/char/hw_random/pasemi-rng.c > +++ b/drivers/char/hw_random/pasemi-rng.c > @@ -9,11 +9,10 @@ > > #include <linux/module.h> > #include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > #include <linux/platform_device.h> > #include <linux/hw_random.h> > #include <linux/delay.h> > -#include <linux/of_address.h> > -#include <linux/of_platform.h> > #include <linux/io.h> > > #define SDCRNG_CTL_REG 0x00 > diff --git a/drivers/char/hw_random/pic32-rng.c b/drivers/char/hw_random/pic32-rng.c > index 99c8bd0859a1..728b68b1a496 100644 > --- a/drivers/char/hw_random/pic32-rng.c > +++ b/drivers/char/hw_random/pic32-rng.c > @@ -12,9 +12,8 @@ > #include <linux/hw_random.h> > #include <linux/io.h> > #include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > -#include <linux/of.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > > diff --git a/drivers/char/hw_random/stm32-rng.c b/drivers/char/hw_random/stm32-rng.c > index a6731cf0627a..efb6a9f9a11b 100644 > --- a/drivers/char/hw_random/stm32-rng.c > +++ b/drivers/char/hw_random/stm32-rng.c > @@ -10,8 +10,9 @@ > #include <linux/iopoll.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/of.h> > #include <linux/of_address.h> > -#include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/reset.h> > #include <linux/slab.h> > diff --git a/drivers/char/hw_random/xgene-rng.c b/drivers/char/hw_random/xgene-rng.c > index 7c8f3cb7c6af..c25bb169563d 100644 > --- a/drivers/char/hw_random/xgene-rng.c > +++ b/drivers/char/hw_random/xgene-rng.c > @@ -15,9 +15,8 @@ > #include <linux/init.h> > #include <linux/interrupt.h> > #include <linux/module.h> > -#include <linux/of_platform.h> > -#include <linux/of_irq.h> > -#include <linux/of_address.h> > +#include <linux/mod_devicetable.h> > +#include <linux/platform_device.h> > #include <linux/timer.h> > > #define RNG_MAX_DATUM 4 > diff --git a/drivers/char/hw_random/xiphera-trng.c b/drivers/char/hw_random/xiphera-trng.c > index 2a9fea72b2e0..2c586d1fe8a9 100644 > --- a/drivers/char/hw_random/xiphera-trng.c > +++ b/drivers/char/hw_random/xiphera-trng.c > @@ -7,7 +7,6 @@ > #include <linux/err.h> > #include <linux/io.h> > #include <linux/hw_random.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/delay.h> > > diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c > index 2dea8cd5a09a..72640da55380 100644 > --- a/drivers/char/ipmi/kcs_bmc_aspeed.c > +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c > @@ -14,7 +14,6 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_address.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/poll.h> > #include <linux/regmap.h> > diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c > index 528f35b14fb6..76adb108076c 100644 > --- a/drivers/char/tpm/tpm_ftpm_tee.c > +++ b/drivers/char/tpm/tpm_ftpm_tee.c > @@ -11,7 +11,6 @@ > > #include <linux/acpi.h> > #include <linux/of.h> > -#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/tee_drv.h> > #include <linux/tpm.h> > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index 7db3593941ea..e4030404c64e 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -25,7 +25,6 @@ > #include <linux/acpi.h> > #include <linux/freezer.h> > #include <linux/of.h> > -#include <linux/of_device.h> > #include <linux/kernel.h> > #include <linux/dmi.h> > #include "tpm.h" > diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c > index 1f5207974a17..c6101914629d 100644 > --- a/drivers/char/tpm/tpm_tis_spi_main.c > +++ b/drivers/char/tpm/tpm_tis_spi_main.c > @@ -28,7 +28,7 @@ > #include <linux/module.h> > #include <linux/slab.h> > > -#include <linux/of_device.h> > +#include <linux/of.h> > #include <linux/spi/spi.h> > #include <linux/tpm.h> > > diff --git a/drivers/char/tpm/tpm_tis_synquacer.c b/drivers/char/tpm/tpm_tis_synquacer.c > index 49278746b0e2..7f9b4bfceb6e 100644 > --- a/drivers/char/tpm/tpm_tis_synquacer.c > +++ b/drivers/char/tpm/tpm_tis_synquacer.c > @@ -9,7 +9,6 @@ > #include <linux/module.h> > #include <linux/slab.h> > #include <linux/of.h> > -#include <linux/of_device.h> > #include <linux/kernel.h> > #include "tpm.h" > #include "tpm_tis_core.h" > -- > 2.40.1 drivers/char/tpm/** Acked-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> BR, Jarkko
