Commit 81d7cac4 authored by Rob Herring's avatar Rob Herring Committed by Michael Ellerman
Browse files

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: default avatarRob Herring <robh@kernel.org>
[mpe: Fixup maple/setup.c which needs platform_device]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230724210247.778034-1-robh@kernel.org
parent e43c0a0c

arch/powerpc/include/asm/ibmebus.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#include <linux/of_device.h>

#include <linux/of_platform.h>



struct platform_driver;



extern struct bus_type ibmebus_bus_type;



int ibmebus_register_driver(struct platform_driver *drv);

arch/powerpc/include/asm/macio.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#define __MACIO_ASIC_H__

#ifdef __KERNEL__



#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>



extern struct bus_type macio_bus_type;

arch/powerpc/kernel/legacy_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
#include <linux/serial_core.h>

#include <linux/console.h>

#include <linux/pci.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/serial_reg.h>

#include <asm/io.h>

arch/powerpc/kernel/of_platform.c

+1 −3
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ 
#include <linux/export.h>

#include <linux/mod_devicetable.h>

#include <linux/pci.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/atomic.h>



#include <asm/errno.h>

arch/powerpc/kernel/setup-common.c

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
#include <linux/serial_8250.h>

#include <linux/percpu.h>

#include <linux/memblock.h>

#include <linux/of_irq.h>

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/of_irq.h>

#include <linux/hugetlb.h>

#include <linux/pgtable.h>

#include <asm/io.h>