sparc: Explicitly include correct DT includes
Subsystems (2)
PATCH v2 1/1 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 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.
---
v2:
- Fix double include of of.h
--- arch/sparc/crypto/crop_devid.c | 2 +- arch/sparc/include/asm/floppy_32.h | 2 +- arch/sparc/include/asm/floppy_64.h | 2 +- arch/sparc/include/asm/parport.h | 3 ++- arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/auxio_32.c | 1 - arch/sparc/kernel/auxio_64.c | 3 ++- arch/sparc/kernel/central.c | 2 +- arch/sparc/kernel/chmc.c | 3 ++- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/leon_kernel.c | 2 -- arch/sparc/kernel/leon_pci.c | 3 ++- arch/sparc/kernel/leon_pci_grpci1.c | 3 ++- arch/sparc/kernel/leon_pci_grpci2.c | 4 +++- arch/sparc/kernel/of_device_32.c | 1 + arch/sparc/kernel/of_device_64.c | 3 ++- arch/sparc/kernel/of_device_common.c | 4 ++-- arch/sparc/kernel/pci.c | 3 ++- arch/sparc/kernel/pci_common.c | 3 ++- arch/sparc/kernel/pci_fire.c | 3 ++- arch/sparc/kernel/pci_impl.h | 1 - arch/sparc/kernel/pci_msi.c | 2 ++ arch/sparc/kernel/pci_psycho.c | 4 +++- arch/sparc/kernel/pci_sun4v.c | 3 ++- arch/sparc/kernel/pmc.c | 2 +- arch/sparc/kernel/power.c | 3 ++- arch/sparc/kernel/prom_irqtrans.c | 1 + arch/sparc/kernel/psycho_common.c | 1 + arch/sparc/kernel/sbus.c | 3 ++- arch/sparc/kernel/time_32.c | 1 - arch/sparc/mm/io-unit.c | 3 ++- arch/sparc/mm/iommu.c | 5 +++-- 32 files changed, 49 insertions(+), 31 deletions(-)
arch/sparc/crypto/crop_devid.c +1 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> /* This is a dummy device table linked into all of the crypto * opcode drivers. It serves to trigger the module autoloading
arch/sparc/include/asm/floppy_32.h +1 -1
@@ -8,7 +8,7 @@#define __ASM_SPARC_FLOPPY_H#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/pgtable.h> #include <asm/idprom.h>
arch/sparc/include/asm/floppy_64.h +1 -1
@@ -11,7 +11,7 @@#define __ASM_SPARC64_FLOPPY_H#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/dma-mapping.h> #include <asm/auxio.h>
arch/sparc/include/asm/parport.h +2 -1
@@ -7,7 +7,8 @@#ifndef _ASM_SPARC64_PARPORT_H#define _ASM_SPARC64_PARPORT_H 1 -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/ebus_dma.h> #include <asm/ns87303.h>
arch/sparc/kernel/apc.c +1 -1
@@ -13,7 +13,7 @@#include <linux/miscdevice.h> #include <linux/pm.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <asm/io.h>
arch/sparc/kernel/auxio_32.c +0 -1
@@ -8,7 +8,6 @@#include <linux/init.h> #include <linux/spinlock.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/export.h> #include <asm/oplib.h>
arch/sparc/kernel/auxio_64.c +2 -1
@@ -10,7 +10,8 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/ioport.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/io.h>
arch/sparc/kernel/central.c +1 -1
@@ -10,7 +10,7 @@#include <linux/export.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <asm/fhc.h>
arch/sparc/kernel/chmc.c +2 -1
@@ -15,7 +15,8 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/spitfire.h> #include <asm/chmctrl.h> #include <asm/cpudata.h>
arch/sparc/kernel/ioport.c +1 -1
@@ -39,7 +39,7 @@#include <linux/seq_file.h> #include <linux/scatterlist.h> #include <linux/dma-map-ops.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <asm/io.h> #include <asm/vaddrs.h>
arch/sparc/kernel/leon_kernel.c +0 -2
@@ -8,9 +8,7 @@#include <linux/errno.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/interrupt.h> -#include <linux/of_device.h> #include <linux/clocksource.h> #include <linux/clockchips.h>
arch/sparc/kernel/leon_pci.c +2 -1
@@ -7,7 +7,8 @@* Code is partially derived from pcic.c */ -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/export.h>
arch/sparc/kernel/leon_pci_grpci1.c +2 -1
@@ -13,10 +13,11 @@* Contributors: Daniel Hellstrom <[email protected]> */ -#include <linux/of_device.h> #include <linux/export.h> #include <linux/kernel.h> +#include <linux/of.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> #include <linux/delay.h> #include <linux/pci.h>
arch/sparc/kernel/leon_pci_grpci2.c +3 -1
@@ -6,12 +6,14 @@* */ -#include <linux/of_device.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/export.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <asm/io.h> #include <asm/leon.h> #include <asm/vaddrs.h>
arch/sparc/kernel/of_device_32.c +1 -0
@@ -8,6 +8,7 @@#include <linux/errno.h> #include <linux/irq.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <asm/leon.h> #include <asm/leon_amba.h>
arch/sparc/kernel/of_device_64.c +2 -1
@@ -1,7 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/string.h> #include <linux/kernel.h> -#include <linux/of.h> #include <linux/dma-mapping.h> #include <linux/init.h> #include <linux/export.h>
@@ -9,7 +8,9 @@#include <linux/slab.h> #include <linux/errno.h> #include <linux/irq.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/spitfire.h> #include "of_device_common.h"
arch/sparc/kernel/of_device_common.c +2 -2
@@ -1,15 +1,15 @@// SPDX-License-Identifier: GPL-2.0-only #include <linux/string.h> #include <linux/kernel.h> -#include <linux/of.h> #include <linux/export.h> #include <linux/mod_devicetable.h> #include <linux/errno.h> #include <linux/irq.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> #include "of_device_common.h"
arch/sparc/kernel/pci.c +2 -1
@@ -20,8 +20,9 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/pgtable.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <asm/irq.h>
arch/sparc/kernel/pci_common.c +2 -1
@@ -8,7 +8,8 @@#include <linux/slab.h> #include <linux/pci.h> #include <linux/device.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/oplib.h>
arch/sparc/kernel/pci_fire.c +2 -1
@@ -10,7 +10,8 @@#include <linux/msi.h> #include <linux/export.h> #include <linux/irq.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/numa.h> #include <asm/prom.h>
arch/sparc/kernel/pci_impl.h +0 -1
@@ -11,7 +11,6 @@#include <linux/spinlock.h> #include <linux/pci.h> #include <linux/msi.h> -#include <linux/of_device.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/iommu.h>
arch/sparc/kernel/pci_msi.c +2 -0
@@ -5,6 +5,8 @@*/ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/irq.h>
arch/sparc/kernel/pci_psycho.c +3 -1
@@ -13,7 +13,9 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/iommu.h> #include <asm/irq.h>
arch/sparc/kernel/pci_sun4v.c +2 -1
@@ -15,7 +15,8 @@#include <linux/msi.h> #include <linux/export.h> #include <linux/log2.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/dma-map-ops.h> #include <asm/iommu-common.h>
arch/sparc/kernel/pmc.c +1 -1
@@ -11,7 +11,7 @@#include <linux/init.h> #include <linux/pm.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <asm/io.h>
arch/sparc/kernel/power.c +2 -1
@@ -9,7 +9,8 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/reboot.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/io.h>
arch/sparc/kernel/prom_irqtrans.c +1 -0
@@ -4,6 +4,7 @@#include <linux/init.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/oplib.h> #include <asm/prom.h>
arch/sparc/kernel/psycho_common.c +1 -0
@@ -6,6 +6,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/numa.h> +#include <linux/platform_device.h> #include <asm/upa.h>
arch/sparc/kernel/sbus.c +2 -1
@@ -14,7 +14,8 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/numa.h> #include <asm/page.h>
arch/sparc/kernel/time_32.c +0 -1
@@ -33,7 +33,6 @@#include <linux/ioport.h> #include <linux/profile.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <asm/mc146818rtc.h>
arch/sparc/mm/io-unit.c +2 -1
@@ -13,7 +13,8 @@#include <linux/bitops.h> #include <linux/dma-map-ops.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/io-unit.h>
arch/sparc/mm/iommu.c +3 -2
@@ -7,14 +7,15 @@* Copyright (C) 1996 Eddie C. Dost ([email protected]) * Copyright (C) 1997,1998 Jakub Jelinek ([email protected]) */ - +#include <linux/kernel.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/dma-map-ops.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/mxcc.h>
Signature · 1 line
2.40.1
Hi Rob!
Quoted 8 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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.
I would suggest rephrasing the subject to
sparc: Explicitly include correct DT headers
as " ... include ... includes" sounds a bit awkward ;-).
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 13 lines · John Paul Adrian Glaubitz
Hi Rob!
Quoted 8 lines · Rob Herring
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore 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 includeplatform_device.handof.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.
Quoted 5 lines
I would suggest rephrasing the subject to
sparc: Explicitly include correct DT headers
as " ... include ... includes" sounds a bit awkward ;-).
Probably would have been better, but there's ~100 other patches with the same subject. Some of those have been applied already.
Rob