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.
Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
---
drivers/macintosh/ams/ams.h | 1 -
drivers/macintosh/smu.c | 1 +
drivers/macintosh/therm_adt746x.c | 2 ++
drivers/macintosh/therm_windtunnel.c | 22 ++++++++++++----------
drivers/macintosh/windfarm_lm75_sensor.c | 4 ++--
5 files changed, 17 insertions(+), 13 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/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..52289de15058 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -1,9 +1,9 @@
-/*
+/*
* Creation Date: <2003/03/14 20:54:13 samuel>
* Time-stamp: <2004/03/20 14:20:59 samuel>
- *
+ *
* <therm_windtunnel.c>
- *
+ *
* The G4 "windtunnel" has a single fan controlled by an
* ADM1030 fan controller and a DS1775 thermostat.
*
@@ -20,11 +20,11 @@
* Copyright (C) 2003, 2004 Samuel Rydh (samuel@xxxxxxxxx)
*
* Loosely based upon 'thermostat.c' written by Benjamin Herrenschmidt
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation
- *
+ *
*/
#include <linux/types.h>
@@ -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>
@@ -48,10 +50,10 @@
static struct {
volatile int running;
struct task_struct *poll_task;
-
+
struct mutex lock;
struct platform_device *of_dev;
-
+
struct i2c_client *thermostat;
struct i2c_client *fan;
@@ -127,7 +129,7 @@ write_reg( struct i2c_client *cl, int reg, int data, int len )
tmp[1] = (len == 1) ? data : (data >> 8);
tmp[2] = data;
len++;
-
+
if( i2c_master_send(cl, tmp, len) != len )
return -ENODEV;
return 0;
@@ -369,7 +371,7 @@ attach_fan( struct i2c_client *cl )
}
static int
-attach_thermostat( struct i2c_client *cl )
+attach_thermostat( struct i2c_client *cl )
{
int hyst_temp, os_temp, temp;
@@ -378,7 +380,7 @@ attach_thermostat( struct i2c_client *cl )
if( (temp=read_reg(cl, 0, 2)) < 0 )
goto out;
-
+
/* temperature sanity check */
if( temp < 0x1600 || temp > 0x3c00 )
goto out;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 48dbdb2bda15..6b26e0f92105 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>
@@ -128,7 +128,7 @@ static int wf_lm75_probe(struct i2c_client *client)
name = "cpu-inlet-temp-1";
else
return -ENXIO;
-
+
lm = kzalloc(sizeof(struct wf_lm75_sensor), GFP_KERNEL);
if (lm == NULL)
--
2.40.1
