On Fri, Jul 14, 2023 at 7:44 PM Rob Herring <robh@xxxxxxxxxx> 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> Acked-by: Rafael J. Wysocki <rafael@xxxxxxxxxx> > --- > drivers/cpufreq/armada-37xx-cpufreq.c | 4 +--- > drivers/cpufreq/mediatek-cpufreq-hw.c | 3 ++- > drivers/cpufreq/ppc_cbe_cpufreq.c | 2 +- > drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 1 - > drivers/cpufreq/qcom-cpufreq-nvmem.c | 1 - > drivers/cpufreq/scpi-cpufreq.c | 2 +- > drivers/cpufreq/sti-cpufreq.c | 2 +- > drivers/cpufreq/ti-cpufreq.c | 2 +- > drivers/cpufreq/vexpress-spc-cpufreq.c | 1 - > 9 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c > index b74289a95a17..bea41ccabf1f 100644 > --- a/drivers/cpufreq/armada-37xx-cpufreq.c > +++ b/drivers/cpufreq/armada-37xx-cpufreq.c > @@ -14,10 +14,8 @@ > #include <linux/interrupt.h> > #include <linux/io.h> > #include <linux/mfd/syscon.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > -#include <linux/of_address.h> > -#include <linux/of_device.h> > -#include <linux/of_irq.h> > #include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/regmap.h> > diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c > index b22f5cc8a463..c93e14eb6221 100644 > --- a/drivers/cpufreq/mediatek-cpufreq-hw.c > +++ b/drivers/cpufreq/mediatek-cpufreq-hw.c > @@ -10,8 +10,9 @@ > #include <linux/iopoll.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/of_address.h> > +#include <linux/of.h> > #include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <linux/slab.h> > > #define LUT_MAX_ENTRIES 32U > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c > index e3313ce63b38..88afc49941b7 100644 > --- a/drivers/cpufreq/ppc_cbe_cpufreq.c > +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c > @@ -9,7 +9,7 @@ > > #include <linux/cpufreq.h> > #include <linux/module.h> > -#include <linux/of_platform.h> > +#include <linux/of.h> > > #include <asm/machdep.h> > #include <asm/cell-regs.h> > diff --git a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > index 4fba3637b115..6f0c32592416 100644 > --- a/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > +++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c > @@ -11,7 +11,6 @@ > #include <linux/types.h> > #include <linux/timer.h> > #include <linux/init.h> > -#include <linux/of_platform.h> > #include <linux/pm_qos.h> > #include <linux/slab.h> > > diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c > index a88b6fe5db50..4590c2570086 100644 > --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c > +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c > @@ -22,7 +22,6 @@ > #include <linux/module.h> > #include <linux/nvmem-consumer.h> > #include <linux/of.h> > -#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/pm_opp.h> > diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c > index fd2c16821d54..ac719aca49b7 100644 > --- a/drivers/cpufreq/scpi-cpufreq.c > +++ b/drivers/cpufreq/scpi-cpufreq.c > @@ -14,7 +14,7 @@ > #include <linux/cpumask.h> > #include <linux/export.h> > #include <linux/module.h> > -#include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/scpi_protocol.h> > #include <linux/slab.h> > diff --git a/drivers/cpufreq/sti-cpufreq.c b/drivers/cpufreq/sti-cpufreq.c > index 1a63aeea8711..9c542e723a15 100644 > --- a/drivers/cpufreq/sti-cpufreq.c > +++ b/drivers/cpufreq/sti-cpufreq.c > @@ -13,7 +13,7 @@ > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > -#include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/regmap.h> > > diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c > index d5cd2fd25cad..3c37d7899660 100644 > --- a/drivers/cpufreq/ti-cpufreq.c > +++ b/drivers/cpufreq/ti-cpufreq.c > @@ -12,7 +12,7 @@ > #include <linux/module.h> > #include <linux/init.h> > #include <linux/of.h> > -#include <linux/of_platform.h> > +#include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/regmap.h> > #include <linux/slab.h> > diff --git a/drivers/cpufreq/vexpress-spc-cpufreq.c b/drivers/cpufreq/vexpress-spc-cpufreq.c > index d295f405c4bb..865e50164803 100644 > --- a/drivers/cpufreq/vexpress-spc-cpufreq.c > +++ b/drivers/cpufreq/vexpress-spc-cpufreq.c > @@ -18,7 +18,6 @@ > #include <linux/device.h> > #include <linux/module.h> > #include <linux/mutex.h> > -#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/slab.h> > -- > 2.40.1 >
