tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sparc: 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 was 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.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://lore.kernel.org/all/20230718143211.1066810-1-robh@kernel.org/
Signed-off-by: Rob Herring <robh@kernel.org>
+49
-33
+1
-1
arch/sparc/crypto/crop_devid.c
+1
-1
arch/sparc/crypto/crop_devid.c
+1
-1
arch/sparc/include/asm/floppy_32.h
+1
-1
arch/sparc/include/asm/floppy_32.h
+1
-1
arch/sparc/include/asm/floppy_64.h
+1
-1
arch/sparc/include/asm/floppy_64.h
+2
-1
arch/sparc/include/asm/parport.h
+2
-1
arch/sparc/include/asm/parport.h
+1
-1
arch/sparc/kernel/apc.c
+1
-1
arch/sparc/kernel/apc.c
-1
arch/sparc/kernel/auxio_32.c
-1
arch/sparc/kernel/auxio_32.c
+2
-1
arch/sparc/kernel/auxio_64.c
+2
-1
arch/sparc/kernel/auxio_64.c
+1
-1
arch/sparc/kernel/central.c
+1
-1
arch/sparc/kernel/central.c
+2
-1
arch/sparc/kernel/chmc.c
+2
-1
arch/sparc/kernel/chmc.c
+1
-1
arch/sparc/kernel/ioport.c
+1
-1
arch/sparc/kernel/ioport.c
-2
arch/sparc/kernel/leon_kernel.c
-2
arch/sparc/kernel/leon_kernel.c
+2
-1
arch/sparc/kernel/leon_pci.c
+2
-1
arch/sparc/kernel/leon_pci.c
+2
-1
arch/sparc/kernel/leon_pci_grpci1.c
+2
-1
arch/sparc/kernel/leon_pci_grpci1.c
···
13
13
* Contributors: Daniel Hellstrom <daniel@gaisler.com>
14
14
*/
15
15
16
-
#include <linux/of_device.h>
17
16
#include <linux/export.h>
18
17
#include <linux/kernel.h>
18
+
#include <linux/of.h>
19
19
#include <linux/of_irq.h>
20
+
#include <linux/platform_device.h>
20
21
#include <linux/delay.h>
21
22
#include <linux/pci.h>
22
23
+3
-1
arch/sparc/kernel/leon_pci_grpci2.c
+3
-1
arch/sparc/kernel/leon_pci_grpci2.c
···
6
6
*
7
7
*/
8
8
9
-
#include <linux/of_device.h>
10
9
#include <linux/kernel.h>
11
10
#include <linux/pci.h>
12
11
#include <linux/slab.h>
13
12
#include <linux/delay.h>
14
13
#include <linux/export.h>
14
+
#include <linux/of.h>
15
+
#include <linux/platform_device.h>
16
+
15
17
#include <asm/io.h>
16
18
#include <asm/leon.h>
17
19
#include <asm/vaddrs.h>
+1
-1
arch/sparc/kernel/of_device_32.c
+1
-1
arch/sparc/kernel/of_device_32.c
+2
-2
arch/sparc/kernel/of_device_64.c
+2
-2
arch/sparc/kernel/of_device_64.c
···
1
1
// SPDX-License-Identifier: GPL-2.0
2
2
#include <linux/string.h>
3
3
#include <linux/kernel.h>
4
-
#include <linux/of.h>
5
4
#include <linux/dma-mapping.h>
6
5
#include <linux/init.h>
7
6
#include <linux/export.h>
···
8
9
#include <linux/slab.h>
9
10
#include <linux/errno.h>
10
11
#include <linux/irq.h>
11
-
#include <linux/of_device.h>
12
+
#include <linux/of.h>
12
13
#include <linux/of_platform.h>
14
+
#include <linux/platform_device.h>
13
15
#include <asm/spitfire.h>
14
16
15
17
#include "of_device_common.h"
+2
-2
arch/sparc/kernel/of_device_common.c
+2
-2
arch/sparc/kernel/of_device_common.c
···
1
1
// SPDX-License-Identifier: GPL-2.0-only
2
2
#include <linux/string.h>
3
3
#include <linux/kernel.h>
4
-
#include <linux/of.h>
5
4
#include <linux/export.h>
6
5
#include <linux/mod_devicetable.h>
7
6
#include <linux/errno.h>
8
7
#include <linux/irq.h>
8
+
#include <linux/of.h>
9
9
#include <linux/of_platform.h>
10
10
#include <linux/of_address.h>
11
-
#include <linux/of_device.h>
12
11
#include <linux/of_irq.h>
12
+
#include <linux/platform_device.h>
13
13
14
14
#include "of_device_common.h"
15
15
+2
-1
arch/sparc/kernel/pci.c
+2
-1
arch/sparc/kernel/pci.c
+2
-1
arch/sparc/kernel/pci_common.c
+2
-1
arch/sparc/kernel/pci_common.c
+2
-1
arch/sparc/kernel/pci_fire.c
+2
-1
arch/sparc/kernel/pci_fire.c
-1
arch/sparc/kernel/pci_impl.h
-1
arch/sparc/kernel/pci_impl.h
+2
arch/sparc/kernel/pci_msi.c
+2
arch/sparc/kernel/pci_msi.c
+3
-1
arch/sparc/kernel/pci_psycho.c
+3
-1
arch/sparc/kernel/pci_psycho.c
+2
-1
arch/sparc/kernel/pci_sun4v.c
+2
-1
arch/sparc/kernel/pci_sun4v.c
+1
-1
arch/sparc/kernel/pmc.c
+1
-1
arch/sparc/kernel/pmc.c
+2
-1
arch/sparc/kernel/power.c
+2
-1
arch/sparc/kernel/power.c
+1
arch/sparc/kernel/prom_irqtrans.c
+1
arch/sparc/kernel/prom_irqtrans.c
+1
arch/sparc/kernel/psycho_common.c
+1
arch/sparc/kernel/psycho_common.c
+2
-1
arch/sparc/kernel/sbus.c
+2
-1
arch/sparc/kernel/sbus.c
-1
arch/sparc/kernel/time_32.c
-1
arch/sparc/kernel/time_32.c
+2
-1
arch/sparc/mm/io-unit.c
+2
-1
arch/sparc/mm/io-unit.c
+3
-2
arch/sparc/mm/iommu.c
+3
-2
arch/sparc/mm/iommu.c
···
7
7
* Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
8
8
* Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
9
9
*/
10
-
10
+
11
11
#include <linux/kernel.h>
12
12
#include <linux/init.h>
13
13
#include <linux/mm.h>
14
14
#include <linux/slab.h>
15
15
#include <linux/dma-map-ops.h>
16
16
#include <linux/of.h>
17
-
#include <linux/of_device.h>
17
+
#include <linux/of_platform.h>
18
+
#include <linux/platform_device.h>
18
19
19
20
#include <asm/io.h>
20
21
#include <asm/mxcc.h>