diff options
| author | Rob Herring <robh@kernel.org> | 2023-07-14 11:46:54 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-08-28 13:36:24 -0500 |
| commit | 233d687d1b78080ee79f67356327e0e0e50ef6f5 (patch) | |
| tree | 7cdcb9f962d796a02fb70d99ed42f76a63a05608 /drivers/macintosh | |
| parent | 32bc7297d855608fcb13af62a95739a079b4f8e2 (diff) | |
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>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/ams/ams.h | 1 | ||||
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 1 | ||||
| -rw-r--r-- | drivers/macintosh/smu.c | 1 | ||||
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/windfarm_lm75_sensor.c | 2 |
6 files changed, 7 insertions, 2 deletions
diff --git a/drivers/macintosh/ams/ams.h b/drivers/macintosh/ams/ams.h index 2c159c8844c1..e053c1515460 100644 --- a/drivers/macintosh/ams/ams.h +++ b/drivers/macintosh/ams/ams.h @@ -8,7 +8,6 @@ #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/types.h> -#include <linux/of_device.h> enum ams_irq { AMS_IRQ_FREEFALL = 0x01, diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 211ed9aa9edc..a5ee8f736a8e 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -23,6 +23,7 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/of_irq.h> #include <asm/machdep.h> diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 5183a00529f5..b2b78a53e532 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -37,6 +37,7 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/sched/signal.h> diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 53ea56b286f9..00693741f744 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c @@ -25,7 +25,9 @@ #include <linux/kthread.h> #include <linux/moduleparam.h> #include <linux/freezer.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/machdep.h> #include <asm/io.h> diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 18a982454321..3c1b29476ce2 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c @@ -36,7 +36,9 @@ #include <linux/i2c.h> #include <linux/init.h> #include <linux/kthread.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/machdep.h> #include <asm/io.h> diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index 48dbdb2bda15..b5d9c2e40148 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/wait.h> #include <linux/i2c.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <asm/machdep.h> #include <asm/io.h> #include <asm/sections.h> |