Skip to content

Commit 39f0343

Browse files
robherringgroeck
robherring
authored and
groeck
committed
hwmon: 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. Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20230714174607.4057185-1-robh@kernel.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 6698cbd commit 39f0343

37 files changed

+30
-40
lines changed

‎drivers/hwmon/ad7418.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/hwmon-sysfs.h>
1717
#include <linux/err.h>
1818
#include <linux/mutex.h>
19-
#include <linux/of_device.h>
19+
#include <linux/of.h>
2020
#include <linux/delay.h>
2121
#include <linux/slab.h>
2222

‎drivers/hwmon/ads7828.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/i2c.h>
1919
#include <linux/init.h>
2020
#include <linux/module.h>
21-
#include <linux/of_device.h>
21+
#include <linux/of.h>
2222
#include <linux/platform_data/ads7828.h>
2323
#include <linux/regmap.h>
2424
#include <linux/slab.h>

‎drivers/hwmon/adt7475.c

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111

1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
1413
#include <linux/init.h>
1514
#include <linux/slab.h>
1615
#include <linux/i2c.h>

‎drivers/hwmon/as370-hwmon.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
#include <linux/init.h>
1212
#include <linux/io.h>
1313
#include <linux/module.h>
14-
#include <linux/of_device.h>
14+
#include <linux/mod_devicetable.h>
15+
#include <linux/platform_device.h>
1516

1617
#define CTRL 0x0
1718
#define PD BIT(0)

‎drivers/hwmon/aspeed-pwm-tacho.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include <linux/io.h>
1313
#include <linux/kernel.h>
1414
#include <linux/module.h>
15-
#include <linux/of_device.h>
16-
#include <linux/of_platform.h>
15+
#include <linux/of.h>
1716
#include <linux/platform_device.h>
1817
#include <linux/regmap.h>
1918
#include <linux/reset.h>

‎drivers/hwmon/g762.c

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include <linux/kernel.h>
4040
#include <linux/clk.h>
4141
#include <linux/of.h>
42-
#include <linux/of_device.h>
4342
#include <linux/platform_data/g762.h>
4443

4544
#define DRVNAME "g762"

‎drivers/hwmon/gxp-fan-ctrl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <linux/hwmon.h>
77
#include <linux/io.h>
88
#include <linux/module.h>
9-
#include <linux/of_device.h>
9+
#include <linux/mod_devicetable.h>
1010
#include <linux/platform_device.h>
1111

1212
#define OFS_FAN_INST 0 /* Is 0 because plreg base will be set at INST */

‎drivers/hwmon/ina2xx.c

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <linux/hwmon.h>
3232
#include <linux/hwmon-sysfs.h>
3333
#include <linux/jiffies.h>
34-
#include <linux/of_device.h>
3534
#include <linux/of.h>
3635
#include <linux/delay.h>
3736
#include <linux/util_macros.h>

‎drivers/hwmon/lm63.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <linux/hwmon.h>
3434
#include <linux/err.h>
3535
#include <linux/mutex.h>
36-
#include <linux/of_device.h>
36+
#include <linux/of.h>
3737
#include <linux/sysfs.h>
3838
#include <linux/types.h>
3939

‎drivers/hwmon/lm75.c

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/hwmon.h>
1414
#include <linux/hwmon-sysfs.h>
1515
#include <linux/err.h>
16-
#include <linux/of_device.h>
1716
#include <linux/of.h>
1817
#include <linux/regmap.h>
1918
#include <linux/util_macros.h>

‎drivers/hwmon/lm85.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
#include <linux/module.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include <linux/init.h>
1717
#include <linux/slab.h>
1818
#include <linux/jiffies.h>

‎drivers/hwmon/lm90.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
#include <linux/kstrtox.h>
107107
#include <linux/module.h>
108108
#include <linux/mutex.h>
109-
#include <linux/of_device.h>
109+
#include <linux/of.h>
110110
#include <linux/regulator/consumer.h>
111111
#include <linux/slab.h>
112112
#include <linux/workqueue.h>

‎drivers/hwmon/lochnagar-hwmon.c

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/mfd/lochnagar2_regs.h>
1717
#include <linux/module.h>
1818
#include <linux/of.h>
19-
#include <linux/of_device.h>
2019
#include <linux/platform_device.h>
2120
#include <linux/regmap.h>
2221

‎drivers/hwmon/ltq-cputemp.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
#include <linux/hwmon.h>
1010
#include <linux/hwmon-sysfs.h>
1111
#include <linux/init.h>
12+
#include <linux/mod_devicetable.h>
1213
#include <linux/module.h>
13-
#include <linux/of_device.h>
14+
#include <linux/platform_device.h>
1415

1516
#include <lantiq_soc.h>
1617

‎drivers/hwmon/max31730.c

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/init.h>
1212
#include <linux/hwmon.h>
1313
#include <linux/module.h>
14-
#include <linux/of_device.h>
1514
#include <linux/of.h>
1615
#include <linux/slab.h>
1716

‎drivers/hwmon/max6621.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/i2c.h>
1313
#include <linux/init.h>
1414
#include <linux/module.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include <linux/regmap.h>
1717

1818
#define MAX6621_DRV_NAME "max6621"

‎drivers/hwmon/max6697.c

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/hwmon-sysfs.h>
1616
#include <linux/err.h>
1717
#include <linux/mutex.h>
18-
#include <linux/of_device.h>
1918
#include <linux/of.h>
2019

2120
#include <linux/platform_data/max6697.h>

‎drivers/hwmon/mcp3021.c

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/err.h>
2121
#include <linux/device.h>
2222
#include <linux/of.h>
23-
#include <linux/of_device.h>
2423

2524
/* Vdd / reference voltage in millivolt */
2625
#define MCP3021_VDD_REF_MAX 5500

‎drivers/hwmon/nsa320-hwmon.c

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <linux/module.h>
2121
#include <linux/mutex.h>
2222
#include <linux/of.h>
23-
#include <linux/of_device.h>
24-
#include <linux/of_platform.h>
2523
#include <linux/platform_device.h>
2624

2725
/* Tests for error return values rely upon this value being < 0x80 */

‎drivers/hwmon/pmbus/dps920ab.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/debugfs.h>
1010
#include <linux/i2c.h>
1111
#include <linux/module.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
1313
#include "pmbus.h"
1414

1515
struct dps920ab_data {

‎drivers/hwmon/pmbus/ibm-cffps.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/leds.h>
1414
#include <linux/module.h>
1515
#include <linux/mutex.h>
16-
#include <linux/of_device.h>
16+
#include <linux/of.h>
1717
#include <linux/pmbus.h>
1818

1919
#include "pmbus.h"

‎drivers/hwmon/pmbus/ir38064.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* VOUT_MODE is not supported by the device. The driver fakes VOUT linear16
88
* mode with exponent value -8 as direct mode with m=256/b=0/R=0.
9-
*
9+
*
1010
* The device supports VOUT_PEAK, IOUT_PEAK, and TEMPERATURE_PEAK, however
1111
* this driver does not currently support them.
1212
*/
@@ -16,7 +16,7 @@
1616
#include <linux/init.h>
1717
#include <linux/kernel.h>
1818
#include <linux/module.h>
19-
#include <linux/of_device.h>
19+
#include <linux/of.h>
2020
#include <linux/regulator/driver.h>
2121
#include "pmbus.h"
2222

‎drivers/hwmon/pmbus/max20730.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/kernel.h>
1616
#include <linux/module.h>
1717
#include <linux/mutex.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of.h>
1919
#include <linux/pmbus.h>
2020
#include <linux/util_macros.h>
2121
#include "pmbus.h"

‎drivers/hwmon/pmbus/mp5023.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <linux/i2c.h>
77
#include <linux/module.h>
8-
#include <linux/of_device.h>
8+
#include <linux/of.h>
99
#include "pmbus.h"
1010

1111
static struct pmbus_driver_info mp5023_info = {

‎drivers/hwmon/pmbus/mpq7932.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/init.h>
1313
#include <linux/kernel.h>
1414
#include <linux/module.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include <linux/pmbus.h>
1717
#include "pmbus.h"
1818

‎drivers/hwmon/pmbus/q54sj108a2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/i2c.h>
1111
#include <linux/kstrtox.h>
1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include "pmbus.h"
1515

1616
#define STORE_DEFAULT_ALL 0x11

‎drivers/hwmon/pmbus/tps53679.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/init.h>
1313
#include <linux/kernel.h>
1414
#include <linux/module.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include "pmbus.h"
1717

1818
enum chips {

‎drivers/hwmon/pmbus/ucd9000.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/delay.h>
1111
#include <linux/kernel.h>
1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/init.h>
1515
#include <linux/err.h>
1616
#include <linux/slab.h>

‎drivers/hwmon/pmbus/ucd9200.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <linux/kernel.h>
99
#include <linux/module.h>
10-
#include <linux/of_device.h>
10+
#include <linux/of.h>
1111
#include <linux/init.h>
1212
#include <linux/err.h>
1313
#include <linux/slab.h>

‎drivers/hwmon/sbtsi_temp.c

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/hwmon.h>
1414
#include <linux/module.h>
1515
#include <linux/mutex.h>
16-
#include <linux/of_device.h>
1716
#include <linux/of.h>
1817

1918
/*

‎drivers/hwmon/scpi-hwmon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <linux/hwmon.h>
1010
#include <linux/module.h>
11-
#include <linux/of_device.h>
11+
#include <linux/of.h>
1212
#include <linux/platform_device.h>
1313
#include <linux/scpi_protocol.h>
1414
#include <linux/slab.h>

‎drivers/hwmon/tmp421.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/hwmon-sysfs.h>
2121
#include <linux/err.h>
2222
#include <linux/mutex.h>
23-
#include <linux/of_device.h>
23+
#include <linux/of.h>
2424
#include <linux/sysfs.h>
2525

2626
/* Addresses to scan */

‎drivers/hwmon/tmp464.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/init.h>
1515
#include <linux/module.h>
1616
#include <linux/mutex.h>
17-
#include <linux/of_device.h>
17+
#include <linux/of.h>
1818
#include <linux/regmap.h>
1919
#include <linux/slab.h>
2020

‎drivers/hwmon/tps23861.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/hwmon.h>
1515
#include <linux/i2c.h>
1616
#include <linux/module.h>
17-
#include <linux/of_device.h>
17+
#include <linux/of.h>
1818
#include <linux/regmap.h>
1919

2020
#define TEMPERATURE 0x2c

‎drivers/hwmon/ultra45_env.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#include <linux/types.h>
1010
#include <linux/slab.h>
1111
#include <linux/module.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
13+
#include <linux/platform_device.h>
1314
#include <linux/io.h>
1415
#include <linux/hwmon.h>
1516
#include <linux/hwmon-sysfs.h>

‎drivers/hwmon/vexpress-hwmon.c

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/hwmon-sysfs.h>
1414
#include <linux/module.h>
1515
#include <linux/of.h>
16-
#include <linux/of_device.h>
1716
#include <linux/platform_device.h>
1817
#include <linux/vexpress.h>
1918

‎drivers/hwmon/w83773g.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/hwmon.h>
1313
#include <linux/hwmon-sysfs.h>
1414
#include <linux/err.h>
15-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1616
#include <linux/regmap.h>
1717

1818
/* W83773 has 3 channels */

0 commit comments

Comments
 (0)