Skip to content

Commit 263291f

Browse files
committed
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>
1 parent c893884 commit 263291f

32 files changed

+49
-33
lines changed

arch/sparc/crypto/crop_devid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <linux/mod_devicetable.h>
23
#include <linux/module.h>
3-
#include <linux/of_device.h>
44

55
/* This is a dummy device table linked into all of the crypto
66
* opcode drivers. It serves to trigger the module autoloading

arch/sparc/include/asm/floppy_32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define __ASM_SPARC_FLOPPY_H
99

1010
#include <linux/of.h>
11-
#include <linux/of_device.h>
11+
#include <linux/of_platform.h>
1212
#include <linux/pgtable.h>
1313

1414
#include <asm/idprom.h>

arch/sparc/include/asm/floppy_64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define __ASM_SPARC64_FLOPPY_H
1212

1313
#include <linux/of.h>
14-
#include <linux/of_device.h>
14+
#include <linux/of_platform.h>
1515
#include <linux/dma-mapping.h>
1616

1717
#include <asm/auxio.h>

arch/sparc/include/asm/parport.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#ifndef _ASM_SPARC64_PARPORT_H
88
#define _ASM_SPARC64_PARPORT_H 1
99

10-
#include <linux/of_device.h>
10+
#include <linux/of.h>
11+
#include <linux/platform_device.h>
1112

1213
#include <asm/ebus_dma.h>
1314
#include <asm/ns87303.h>

arch/sparc/kernel/apc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/miscdevice.h>
1414
#include <linux/pm.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
16+
#include <linux/platform_device.h>
1717
#include <linux/module.h>
1818

1919
#include <asm/io.h>

arch/sparc/kernel/auxio_32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <linux/init.h>
99
#include <linux/spinlock.h>
1010
#include <linux/of.h>
11-
#include <linux/of_device.h>
1211
#include <linux/export.h>
1312

1413
#include <asm/oplib.h>

arch/sparc/kernel/auxio_64.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#include <linux/kernel.h>
1111
#include <linux/init.h>
1212
#include <linux/ioport.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
14+
#include <linux/platform_device.h>
1415

1516
#include <asm/prom.h>
1617
#include <asm/io.h>

arch/sparc/kernel/central.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/export.h>
1111
#include <linux/string.h>
1212
#include <linux/init.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/platform_device.h>
1515

1616
#include <asm/fhc.h>

arch/sparc/kernel/chmc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
#include <linux/errno.h>
1616
#include <linux/init.h>
1717
#include <linux/of.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of_platform.h>
19+
#include <linux/platform_device.h>
1920
#include <asm/spitfire.h>
2021
#include <asm/chmctrl.h>
2122
#include <asm/cpudata.h>

arch/sparc/kernel/ioport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <linux/seq_file.h>
4040
#include <linux/scatterlist.h>
4141
#include <linux/dma-map-ops.h>
42-
#include <linux/of_device.h>
42+
#include <linux/of.h>
4343

4444
#include <asm/io.h>
4545
#include <asm/vaddrs.h>

0 commit comments

Comments
 (0)