Skip to content

Commit dbce1a7

Browse files
robherringdtor
authored andcommitted
Input: 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 5050193 commit dbce1a7

21 files changed

+20
-22
lines changed

drivers/input/keyboard/sun4i-lradc-keys.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
#include <linux/interrupt.h>
2222
#include <linux/io.h>
2323
#include <linux/module.h>
24-
#include <linux/of_platform.h>
24+
#include <linux/of.h>
2525
#include <linux/platform_device.h>
2626
#include <linux/pm_wakeirq.h>
2727
#include <linux/pm_wakeup.h>
28+
#include <linux/property.h>
2829
#include <linux/regulator/consumer.h>
2930
#include <linux/reset.h>
3031
#include <linux/slab.h>

drivers/input/keyboard/tm2-touchkey.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/leds.h>
2020
#include <linux/module.h>
2121
#include <linux/of.h>
22-
#include <linux/of_device.h>
2322
#include <linux/pm.h>
2423
#include <linux/regulator/consumer.h>
2524

drivers/input/misc/gpio-vibra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/input.h>
1919
#include <linux/kernel.h>
2020
#include <linux/module.h>
21-
#include <linux/of_device.h>
21+
#include <linux/of.h>
2222
#include <linux/platform_device.h>
2323
#include <linux/property.h>
2424
#include <linux/regulator/consumer.h>

drivers/input/misc/iqs269a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <linux/input.h>
1818
#include <linux/interrupt.h>
1919
#include <linux/kernel.h>
20+
#include <linux/mod_devicetable.h>
2021
#include <linux/module.h>
2122
#include <linux/mutex.h>
22-
#include <linux/of_device.h>
2323
#include <linux/property.h>
2424
#include <linux/regmap.h>
2525
#include <linux/slab.h>

drivers/input/misc/iqs626a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <linux/input/touchscreen.h>
2020
#include <linux/interrupt.h>
2121
#include <linux/kernel.h>
22+
#include <linux/mod_devicetable.h>
2223
#include <linux/module.h>
23-
#include <linux/of_device.h>
2424
#include <linux/property.h>
2525
#include <linux/regmap.h>
2626
#include <linux/slab.h>

drivers/input/misc/iqs7222.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <linux/interrupt.h>
1717
#include <linux/kernel.h>
1818
#include <linux/ktime.h>
19+
#include <linux/mod_devicetable.h>
1920
#include <linux/module.h>
20-
#include <linux/of_device.h>
2121
#include <linux/property.h>
2222
#include <linux/slab.h>
2323
#include <asm/unaligned.h>

drivers/input/misc/mma8450.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <linux/delay.h>
1212
#include <linux/i2c.h>
1313
#include <linux/input.h>
14-
#include <linux/of_device.h>
14+
#include <linux/mod_devicetable.h>
1515

1616
#define MMA8450_DRV_NAME "mma8450"
1717

drivers/input/misc/pm8941-pwrkey.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/module.h>
1515
#include <linux/of.h>
1616
#include <linux/of_address.h>
17-
#include <linux/of_device.h>
1817
#include <linux/platform_device.h>
1918
#include <linux/reboot.h>
2019
#include <linux/regmap.h>

drivers/input/misc/pm8xxx-vibrator.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/kernel.h>
88
#include <linux/module.h>
99
#include <linux/of.h>
10-
#include <linux/of_device.h>
1110
#include <linux/platform_device.h>
1211
#include <linux/regmap.h>
1312
#include <linux/slab.h>

drivers/input/misc/pmic8xxx-pwrkey.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/regmap.h>
1313
#include <linux/log2.h>
1414
#include <linux/of.h>
15-
#include <linux/of_device.h>
1615

1716
#define PON_CNTL_1 0x1C
1817
#define PON_CNTL_PULL_UP BIT(7)

0 commit comments

Comments
 (0)