Re: [PATCH] fb: Explicitly include correct DT includes

[Thomas Zimmermann <tzimmermann@suse.de>]

[-- Attachment #1.1: Type: text/plain, Size: 4050 bytes --]

Hi

Am 14.07.23 um 19:50 schrieb Rob Herring:
> 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>
[...]
>   
> @@ -48,7 +48,7 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
>   	unsigned long map_offset = 0;
>   	unsigned long off;
>   	int i;
> -
> +

The various whitespace fixes should rather go into a separate patch. You 
can add

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

to the whitespace fix and the include cleanup.

Best regards
Thomas

>   	if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE)))
>   		return -EINVAL;
>   
> @@ -72,7 +72,7 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
>   #define POFF_MASK	(PAGE_MASK|0x1UL)
>   #else
>   #define POFF_MASK	(PAGE_MASK)
> -#endif				
> +#endif
>   				map_offset = (physbase + map[i].poff) & POFF_MASK;
>   				break;
>   			}
> diff --git a/drivers/video/fbdev/sunxvr1000.c b/drivers/video/fbdev/sunxvr1000.c
> index 490bd9a14763..17d61e1d11a6 100644
> --- a/drivers/video/fbdev/sunxvr1000.c
> +++ b/drivers/video/fbdev/sunxvr1000.c
> @@ -8,7 +8,8 @@
>   #include <linux/kernel.h>
>   #include <linux/fb.h>
>   #include <linux/init.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
>   
>   struct gfb_info {
>   	struct fb_info		*info;
> diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c
> index 2cab4b9be68a..e64ec7d0caf9 100644
> --- a/drivers/video/fbdev/sunxvr2500.c
> +++ b/drivers/video/fbdev/sunxvr2500.c
> @@ -10,7 +10,7 @@
>   #include <linux/fb.h>
>   #include <linux/pci.h>
>   #include <linux/init.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
>   
>   #include <asm/io.h>
>   
> diff --git a/drivers/video/fbdev/sunxvr500.c b/drivers/video/fbdev/sunxvr500.c
> index 6ec358af1256..c4e01e871483 100644
> --- a/drivers/video/fbdev/sunxvr500.c
> +++ b/drivers/video/fbdev/sunxvr500.c
> @@ -10,7 +10,7 @@
>   #include <linux/fb.h>
>   #include <linux/pci.h>
>   #include <linux/init.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
>   
>   #include <asm/io.h>
>   
> diff --git a/drivers/video/fbdev/tcx.c b/drivers/video/fbdev/tcx.c
> index fc3ac2301b45..255eb57aefa2 100644
> --- a/drivers/video/fbdev/tcx.c
> +++ b/drivers/video/fbdev/tcx.c
> @@ -17,7 +17,8 @@
>   #include <linux/init.h>
>   #include <linux/fb.h>
>   #include <linux/mm.h>
> -#include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
>   
>   #include <asm/io.h>
>   #include <asm/fbio.h>
> diff --git a/drivers/video/fbdev/xilinxfb.c b/drivers/video/fbdev/xilinxfb.c
> index 2aa3a528277f..542baddd54ad 100644
> --- a/drivers/video/fbdev/xilinxfb.c
> +++ b/drivers/video/fbdev/xilinxfb.c
> @@ -24,14 +24,13 @@
>   #include <linux/module.h>
>   #include <linux/kernel.h>
>   #include <linux/errno.h>
> +#include <linux/platform_device.h>
>   #include <linux/string.h>
>   #include <linux/mm.h>
>   #include <linux/fb.h>
>   #include <linux/init.h>
>   #include <linux/dma-mapping.h>
> -#include <linux/of_device.h>
> -#include <linux/of_platform.h>
> -#include <linux/of_address.h>
> +#include <linux/of.h>
>   #include <linux/io.h>
>   #include <linux/slab.h>
>   

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]