Skip to content

Commit 233d687

Browse files
committed
macintosh: 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. Link: https://lore.kernel.org/r/20230714174654.4058898-1-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 32bc729 commit 233d687

File tree

6 files changed

+7
-2
lines changed

6 files changed

+7
-2
lines changed

drivers/macintosh/ams/ams.h

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

1312
enum ams_irq {
1413
AMS_IRQ_FREEFALL = 0x01,

drivers/macintosh/macio_asic.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/of.h>
2424
#include <linux/of_address.h>
2525
#include <linux/of_device.h>
26+
#include <linux/of_platform.h>
2627
#include <linux/of_irq.h>
2728

2829
#include <asm/machdep.h>

drivers/macintosh/smu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <linux/of_address.h>
3838
#include <linux/of_irq.h>
3939
#include <linux/of_platform.h>
40+
#include <linux/platform_device.h>
4041
#include <linux/slab.h>
4142
#include <linux/sched/signal.h>
4243

drivers/macintosh/therm_adt746x.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include <linux/kthread.h>
2626
#include <linux/moduleparam.h>
2727
#include <linux/freezer.h>
28+
#include <linux/of.h>
2829
#include <linux/of_platform.h>
30+
#include <linux/platform_device.h>
2931

3032
#include <asm/machdep.h>
3133
#include <asm/io.h>

drivers/macintosh/therm_windtunnel.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
#include <linux/i2c.h>
3737
#include <linux/init.h>
3838
#include <linux/kthread.h>
39+
#include <linux/of.h>
3940
#include <linux/of_platform.h>
41+
#include <linux/platform_device.h>
4042

4143
#include <asm/machdep.h>
4244
#include <asm/io.h>

drivers/macintosh/windfarm_lm75_sensor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/init.h>
1515
#include <linux/wait.h>
1616
#include <linux/i2c.h>
17-
#include <linux/of_device.h>
17+
#include <linux/of.h>
1818
#include <asm/machdep.h>
1919
#include <asm/io.h>
2020
#include <asm/sections.h>

0 commit comments

Comments
 (0)