(was: arch,fbdev: Move screen_info into arch/)
Remove include statements of <linux/screen_info.h> The patches have
been reviewed as part of the patchset at [1]. Patch 1 has a fix to make
it build on loongarch.
v2:
* update loongarch
[1] https://patchwork.freedesktop.org/series/120010/#rev1
Thomas Zimmermann (4):
efi: Do not include <linux/screen_info.h> from EFI header
fbdev/sm712fb: Do not include <linux/screen_info.h>
sysfb: Do not include <linux/screen_info.h> from sysfb header
staging/sm750fb: Do not include <linux/screen_info.h>
arch/arm/kernel/efi.c | 2 ++
arch/arm64/kernel/efi.c | 1 +
arch/loongarch/kernel/efi.c | 1 +
drivers/firmware/efi/libstub/efi-stub-entry.c | 2 ++
drivers/firmware/efi/libstub/screen_info.c | 2 ++
drivers/staging/sm750fb/sm750.c | 1 -
drivers/staging/sm750fb/sm750_accel.c | 1 -
drivers/staging/sm750fb/sm750_cursor.c | 1 -
drivers/staging/sm750fb/sm750_hw.c | 1 -
drivers/video/fbdev/sm712fb.c | 9 +++++++--
include/linux/efi.h | 3 ++-
include/linux/sysfb.h | 3 ++-
12 files changed, 19 insertions(+), 8 deletions(-)
--
2.41.0
The sm750fb driver does not need anything from <linux/screen_info.h>.
Remove the include statements.
Signed-off-by: Thomas Zimmermann <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>
Cc: Sudip Mukherjee <[email protected]>
Cc: Teddy Wang <[email protected]>
---
drivers/staging/sm750fb/sm750.c | 1 -
drivers/staging/sm750fb/sm750_accel.c | 1 -
drivers/staging/sm750fb/sm750_cursor.c | 1 -
drivers/staging/sm750fb/sm750_hw.c | 1 -
4 files changed, 4 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 55e302a27847..c260f73cf570 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -14,7 +14,6 @@
#include <linux/mm_types.h>
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
-#include <linux/screen_info.h>
#include <linux/console.h>
#include "sm750.h"
diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c
index 24b9077a634a..44b9e3fe3a41 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -14,7 +14,6 @@
#include <linux/pagemap.h>
#include <linux/console.h>
#include <linux/platform_device.h>
-#include <linux/screen_info.h>
#include "sm750.h"
#include "sm750_accel.h"
diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c
index 43e6f52c2551..eea4d1bd36ce 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -14,7 +14,6 @@
#include <linux/pagemap.h>
#include <linux/console.h>
#include <linux/platform_device.h>
-#include <linux/screen_info.h>
#include "sm750.h"
#include "sm750_cursor.h"
diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 55cb00e8b0d1..71247eaf26ee 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -17,7 +17,6 @@
#include <asm/mtrr.h>
#endif
#include <linux/platform_device.h>
-#include <linux/screen_info.h>
#include <linux/sizes.h>
#include "sm750.h"
--
2.41.0
The header file <linux/sysfb.h> does not need anything from
<linux/screen_info.h>. Declare struct screen_info and remove
the include statements.
Signed-off-by: Thomas Zimmermann <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>
Reviewed-by: Sui Jingfeng <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Hans de Goede <[email protected]>
Cc: Javier Martinez Canillas <[email protected]>
---
include/linux/sysfb.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h
index c1ef5fc60a3c..19cb803dd5ec 100644
--- a/include/linux/sysfb.h
+++ b/include/linux/sysfb.h
@@ -9,7 +9,8 @@
#include <linux/kernel.h>
#include <linux/platform_data/simplefb.h>
-#include <linux/screen_info.h>
+
+struct screen_info;
enum {
M_I17, /* 17-Inch iMac */
--
2.41.0
On Thu, Jul 6, 2023, at 12:42, Thomas Zimmermann wrote:
> The header file <linux/sysfb.h> does not need anything from
> <linux/screen_info.h>. Declare struct screen_info and remove
> the include statements.
>
> Signed-off-by: Thomas Zimmermann <[email protected]>
> Reviewed-by: Javier Martinez Canillas <[email protected]>
> Reviewed-by: Sui Jingfeng <[email protected]>
> Cc: Ard Biesheuvel <[email protected]>
> Cc: Hans de Goede <[email protected]>
> Cc: Javier Martinez Canillas <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
On Thu, Jul 06, 2023 at 12:42:17PM +0200, Thomas Zimmermann wrote:
> The sm750fb driver does not need anything from <linux/screen_info.h>.
> Remove the include statements.
>
> Signed-off-by: Thomas Zimmermann <[email protected]>
> Reviewed-by: Javier Martinez Canillas <[email protected]>
> Cc: Sudip Mukherjee <[email protected]>
> Cc: Teddy Wang <[email protected]>
> ---
> drivers/staging/sm750fb/sm750.c | 1 -
> drivers/staging/sm750fb/sm750_accel.c | 1 -
> drivers/staging/sm750fb/sm750_cursor.c | 1 -
> drivers/staging/sm750fb/sm750_hw.c | 1 -
> 4 files changed, 4 deletions(-)
>
Reviewed-by: Greg Kroah-Hartman <[email protected]>