Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <tzimmermann@suse.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Rob Herring and committed by
Helge Deller
e8812acb 9d5651ad

+31 -26
+2 -1
drivers/video/fbdev/bw2.c
··· 17 17 #include <linux/init.h> 18 18 #include <linux/fb.h> 19 19 #include <linux/mm.h> 20 - #include <linux/of_device.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/io.h> 23 24 #include <asm/fbio.h>
+2 -1
drivers/video/fbdev/cg14.c
··· 17 17 #include <linux/fb.h> 18 18 #include <linux/mm.h> 19 19 #include <linux/uaccess.h> 20 - #include <linux/of_device.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/io.h> 23 24 #include <asm/fbio.h>
+2 -1
drivers/video/fbdev/cg3.c
··· 17 17 #include <linux/init.h> 18 18 #include <linux/fb.h> 19 19 #include <linux/mm.h> 20 - #include <linux/of_device.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/io.h> 23 24 #include <asm/fbio.h>
+2 -1
drivers/video/fbdev/cg6.c
··· 17 17 #include <linux/init.h> 18 18 #include <linux/fb.h> 19 19 #include <linux/mm.h> 20 - #include <linux/of_device.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/io.h> 23 24 #include <asm/fbio.h>
+2 -1
drivers/video/fbdev/ffb.c
··· 16 16 #include <linux/fb.h> 17 17 #include <linux/mm.h> 18 18 #include <linux/timer.h> 19 - #include <linux/of_device.h> 19 + #include <linux/of.h> 20 + #include <linux/platform_device.h> 20 21 21 22 #include <asm/io.h> 22 23 #include <asm/upa.h>
+1 -2
drivers/video/fbdev/grvga.c
··· 12 12 13 13 #include <linux/platform_device.h> 14 14 #include <linux/dma-mapping.h> 15 - #include <linux/of_platform.h> 16 - #include <linux/of_device.h> 15 + #include <linux/of.h> 17 16 #include <linux/module.h> 18 17 #include <linux/kernel.h> 19 18 #include <linux/string.h>
+2 -1
drivers/video/fbdev/leo.c
··· 16 16 #include <linux/init.h> 17 17 #include <linux/fb.h> 18 18 #include <linux/mm.h> 19 - #include <linux/of_device.h> 20 19 #include <linux/io.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/fbio.h> 23 24
+1 -3
drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/pci.h> 17 17 #include <linux/slab.h> 18 - #if defined(CONFIG_OF) 19 - #include <linux/of_platform.h> 20 - #endif 18 + 21 19 #include "mb862xxfb.h" 22 20 #include "mb862xx_reg.h" 23 21 #include "mb862xxfb_accel.h"
+3 -3
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
··· 18 18 #include <linux/init.h> 19 19 #include <linux/interrupt.h> 20 20 #include <linux/pci.h> 21 - #if defined(CONFIG_OF) 21 + #include <linux/of.h> 22 22 #include <linux/of_address.h> 23 23 #include <linux/of_irq.h> 24 - #include <linux/of_platform.h> 25 - #endif 24 + #include <linux/platform_device.h> 25 + 26 26 #include "mb862xxfb.h" 27 27 #include "mb862xx_reg.h" 28 28
+1 -1
drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
··· 15 15 #include <linux/gpio/consumer.h> 16 16 #include <linux/interrupt.h> 17 17 #include <linux/jiffies.h> 18 + #include <linux/mod_devicetable.h> 18 19 #include <linux/module.h> 19 20 #include <linux/platform_device.h> 20 21 #include <linux/sched/signal.h> 21 22 #include <linux/slab.h> 22 23 #include <linux/workqueue.h> 23 - #include <linux/of_device.h> 24 24 25 25 #include <video/omapfb_dss.h> 26 26 #include <video/mipi_display.h>
+2 -1
drivers/video/fbdev/p9100.c
··· 15 15 #include <linux/init.h> 16 16 #include <linux/fb.h> 17 17 #include <linux/mm.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 + #include <linux/platform_device.h> 19 20 20 21 #include <asm/io.h> 21 22 #include <asm/fbio.h>
+2 -2
drivers/video/fbdev/platinumfb.c
··· 30 30 #include <linux/fb.h> 31 31 #include <linux/init.h> 32 32 #include <linux/nvram.h> 33 + #include <linux/of.h> 33 34 #include <linux/of_address.h> 34 - #include <linux/of_device.h> 35 - #include <linux/of_platform.h> 35 + #include <linux/platform_device.h> 36 36 37 37 #include "macmodes.h" 38 38 #include "platinumfb.h"
+1 -1
drivers/video/fbdev/sbuslib.c
··· 11 11 #include <linux/fb.h> 12 12 #include <linux/mm.h> 13 13 #include <linux/uaccess.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 16 16 #include <asm/fbio.h> 17 17
+2 -1
drivers/video/fbdev/sunxvr1000.c
··· 8 8 #include <linux/kernel.h> 9 9 #include <linux/fb.h> 10 10 #include <linux/init.h> 11 - #include <linux/of_device.h> 11 + #include <linux/of.h> 12 + #include <linux/platform_device.h> 12 13 13 14 struct gfb_info { 14 15 struct fb_info *info;
+1 -1
drivers/video/fbdev/sunxvr2500.c
··· 10 10 #include <linux/fb.h> 11 11 #include <linux/pci.h> 12 12 #include <linux/init.h> 13 - #include <linux/of_device.h> 13 + #include <linux/of.h> 14 14 15 15 #include <asm/io.h> 16 16
+1 -1
drivers/video/fbdev/sunxvr500.c
··· 10 10 #include <linux/fb.h> 11 11 #include <linux/pci.h> 12 12 #include <linux/init.h> 13 - #include <linux/of_device.h> 13 + #include <linux/of.h> 14 14 15 15 #include <asm/io.h> 16 16
+2 -1
drivers/video/fbdev/tcx.c
··· 17 17 #include <linux/init.h> 18 18 #include <linux/fb.h> 19 19 #include <linux/mm.h> 20 - #include <linux/of_device.h> 20 + #include <linux/of.h> 21 + #include <linux/platform_device.h> 21 22 22 23 #include <asm/io.h> 23 24 #include <asm/fbio.h>
+2 -3
drivers/video/fbdev/xilinxfb.c
··· 24 24 #include <linux/module.h> 25 25 #include <linux/kernel.h> 26 26 #include <linux/errno.h> 27 + #include <linux/platform_device.h> 27 28 #include <linux/string.h> 28 29 #include <linux/mm.h> 29 30 #include <linux/fb.h> 30 31 #include <linux/init.h> 31 32 #include <linux/dma-mapping.h> 32 - #include <linux/of_device.h> 33 - #include <linux/of_platform.h> 34 - #include <linux/of_address.h> 33 + #include <linux/of.h> 35 34 #include <linux/io.h> 36 35 #include <linux/slab.h> 37 36