Skip to content

Commit 48144c2

Browse files
robherringalexandrebelloni
authored andcommitted
rtc: 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/20230724205456.767430-1-robh@kernel.org Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 3c87b35 commit 48144c2

30 files changed

Lines changed: 19 additions & 38 deletions

drivers/rtc/rtc-abx80x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/i2c.h>
1616
#include <linux/kstrtox.h>
1717
#include <linux/module.h>
18-
#include <linux/of_device.h>
18+
#include <linux/of.h>
1919
#include <linux/rtc.h>
2020
#include <linux/watchdog.h>
2121

drivers/rtc/rtc-armada38x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/io.h>
1212
#include <linux/module.h>
1313
#include <linux/of.h>
14-
#include <linux/of_device.h>
1514
#include <linux/platform_device.h>
1615
#include <linux/rtc.h>
1716

drivers/rtc/rtc-at91rm9200.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/io.h>
2323
#include <linux/kernel.h>
2424
#include <linux/module.h>
25-
#include <linux/of_device.h>
2625
#include <linux/of.h>
2726
#include <linux/platform_device.h>
2827
#include <linux/rtc.h>

drivers/rtc/rtc-ds1742.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/jiffies.h>
1717
#include <linux/rtc.h>
1818
#include <linux/of.h>
19-
#include <linux/of_device.h>
2019
#include <linux/platform_device.h>
2120
#include <linux/io.h>
2221
#include <linux/module.h>

drivers/rtc/rtc-fsl-ftm-alarm.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
#include <linux/err.h>
1212
#include <linux/interrupt.h>
1313
#include <linux/io.h>
14-
#include <linux/of_address.h>
15-
#include <linux/of_irq.h>
1614
#include <linux/platform_device.h>
17-
#include <linux/of.h>
18-
#include <linux/of_device.h>
15+
#include <linux/mod_devicetable.h>
1916
#include <linux/module.h>
2017
#include <linux/fsl/ftm.h>
2118
#include <linux/rtc.h>

drivers/rtc/rtc-isl12026.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/mutex.h>
1212
#include <linux/nvmem-provider.h>
1313
#include <linux/of.h>
14-
#include <linux/of_device.h>
1514
#include <linux/rtc.h>
1615
#include <linux/slab.h>
1716

drivers/rtc/rtc-isl1208.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/clk.h>
1010
#include <linux/i2c.h>
1111
#include <linux/module.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
1313
#include <linux/of_irq.h>
1414
#include <linux/rtc.h>
1515

drivers/rtc/rtc-jz4740.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <linux/iopoll.h>
1212
#include <linux/kernel.h>
1313
#include <linux/module.h>
14-
#include <linux/of_device.h>
14+
#include <linux/of.h>
1515
#include <linux/platform_device.h>
1616
#include <linux/pm_wakeirq.h>
1717
#include <linux/property.h>

drivers/rtc/rtc-lpc24xx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
#include <linux/clk.h>
1010
#include <linux/io.h>
1111
#include <linux/kernel.h>
12+
#include <linux/mod_devicetable.h>
1213
#include <linux/module.h>
13-
#include <linux/of.h>
14-
#include <linux/of_device.h>
1514
#include <linux/platform_device.h>
1615
#include <linux/rtc.h>
1716

drivers/rtc/rtc-m41t80.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/init.h>
1818
#include <linux/kernel.h>
1919
#include <linux/module.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
2121
#include <linux/rtc.h>
2222
#include <linux/slab.h>
2323
#include <linux/mutex.h>

0 commit comments

Comments
 (0)