diff options
| author | Rob Herring <robh@kernel.org> | 2023-07-25 00:02:42 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-08-02 15:22:19 +0300 |
| commit | 81d7cac4d11cc65f29be68c72759429d5194347a (patch) | |
| tree | 87099e0cfa138f573f5b81e2a961e539bc3ff35d /arch/powerpc/platforms/cell | |
| parent | e43c0a0c3c2870e1ee29519dc249471adf19ab5f (diff) | |
| download | linux-81d7cac4d11cc65f29be68c72759429d5194347a.tar.xz | |
powerpc: Explicitly include correct DT includes
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@kernel.org>
[mpe: Fixup maple/setup.c which needs platform_device]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230724210247.778034-1-robh@kernel.org
Diffstat (limited to 'arch/powerpc/platforms/cell')
| -rw-r--r-- | arch/powerpc/platforms/cell/axon_msi.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/cbe_regs.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spider-pci.c | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 106000449d3b..28dc86744cac 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c @@ -10,10 +10,11 @@ #include <linux/pci.h> #include <linux/msi.h> #include <linux/export.h> -#include <linux/of_platform.h> #include <linux/slab.h> #include <linux/debugfs.h> +#include <linux/of.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> #include <asm/dcr.h> #include <asm/machdep.h> diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c index fb4023f9ea6b..99b3558753e9 100644 --- a/arch/powerpc/platforms/cell/cbe_regs.c +++ b/arch/powerpc/platforms/cell/cbe_regs.c @@ -10,9 +10,8 @@ #include <linux/percpu.h> #include <linux/types.h> #include <linux/export.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_device.h> -#include <linux/of_platform.h> #include <linux/pgtable.h> #include <asm/io.h> diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 8c7133039566..1202a69b0a20 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c @@ -16,7 +16,7 @@ #include <linux/notifier.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/memblock.h> diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 9e07d101bcee..f64a1ef98aa8 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -27,6 +27,7 @@ #include <linux/mutex.h> #include <linux/memory_hotplug.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/mmu.h> #include <asm/processor.h> diff --git a/arch/powerpc/platforms/cell/spider-pci.c b/arch/powerpc/platforms/cell/spider-pci.c index e36ebd84f55b..68439445b1c3 100644 --- a/arch/powerpc/platforms/cell/spider-pci.c +++ b/arch/powerpc/platforms/cell/spider-pci.c @@ -9,7 +9,6 @@ #include <linux/kernel.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include <linux/slab.h> #include <linux/io.h> |