Skip to content

Commit e8812ac

Browse files
robherringhdeller
authored andcommitted
fbdev: 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. Reviewed-by: Thomas Zimmermann <[email protected]> Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 9d5651a commit e8812ac

File tree

18 files changed

+31
-26
lines changed

18 files changed

+31
-26
lines changed

drivers/video/fbdev/bw2.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include <linux/init.h>
1818
#include <linux/fb.h>
1919
#include <linux/mm.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
2122

2223
#include <asm/io.h>
2324
#include <asm/fbio.h>

drivers/video/fbdev/cg14.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include <linux/fb.h>
1818
#include <linux/mm.h>
1919
#include <linux/uaccess.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
2122

2223
#include <asm/io.h>
2324
#include <asm/fbio.h>

drivers/video/fbdev/cg3.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include <linux/init.h>
1818
#include <linux/fb.h>
1919
#include <linux/mm.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
2122

2223
#include <asm/io.h>
2324
#include <asm/fbio.h>

drivers/video/fbdev/cg6.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include <linux/init.h>
1818
#include <linux/fb.h>
1919
#include <linux/mm.h>
20-
#include <linux/of_device.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
2122

2223
#include <asm/io.h>
2324
#include <asm/fbio.h>

drivers/video/fbdev/ffb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#include <linux/fb.h>
1717
#include <linux/mm.h>
1818
#include <linux/timer.h>
19-
#include <linux/of_device.h>
19+
#include <linux/of.h>
20+
#include <linux/platform_device.h>
2021

2122
#include <asm/io.h>
2223
#include <asm/upa.h>

drivers/video/fbdev/grvga.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313
#include <linux/platform_device.h>
1414
#include <linux/dma-mapping.h>
15-
#include <linux/of_platform.h>
16-
#include <linux/of_device.h>
15+
#include <linux/of.h>
1716
#include <linux/module.h>
1817
#include <linux/kernel.h>
1918
#include <linux/string.h>

drivers/video/fbdev/leo.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
#include <linux/init.h>
1717
#include <linux/fb.h>
1818
#include <linux/mm.h>
19-
#include <linux/of_device.h>
2019
#include <linux/io.h>
20+
#include <linux/of.h>
21+
#include <linux/platform_device.h>
2122

2223
#include <asm/fbio.h>
2324

drivers/video/fbdev/mb862xx/mb862xxfb_accel.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
#include <linux/module.h>
1616
#include <linux/pci.h>
1717
#include <linux/slab.h>
18-
#if defined(CONFIG_OF)
19-
#include <linux/of_platform.h>
20-
#endif
18+
2119
#include "mb862xxfb.h"
2220
#include "mb862xx_reg.h"
2321
#include "mb862xxfb_accel.h"

drivers/video/fbdev/mb862xx/mb862xxfbdrv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#include <linux/init.h>
1919
#include <linux/interrupt.h>
2020
#include <linux/pci.h>
21-
#if defined(CONFIG_OF)
21+
#include <linux/of.h>
2222
#include <linux/of_address.h>
2323
#include <linux/of_irq.h>
24-
#include <linux/of_platform.h>
25-
#endif
24+
#include <linux/platform_device.h>
25+
2626
#include "mb862xxfb.h"
2727
#include "mb862xx_reg.h"
2828

drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
#include <linux/gpio/consumer.h>
1616
#include <linux/interrupt.h>
1717
#include <linux/jiffies.h>
18+
#include <linux/mod_devicetable.h>
1819
#include <linux/module.h>
1920
#include <linux/platform_device.h>
2021
#include <linux/sched/signal.h>
2122
#include <linux/slab.h>
2223
#include <linux/workqueue.h>
23-
#include <linux/of_device.h>
2424

2525
#include <video/omapfb_dss.h>
2626
#include <video/mipi_display.h>

0 commit comments

Comments
 (0)