2022-06-10 09:11:13

by Javier Martinez Canillas

Subject: [PATCH] efi: sysfb_efi: remove unnecessary <asm/efi.h> include

Nothing defined in the header is used by drivers/firmware/efi/sysfb_efi.c
but also, including it can lead to build errors when built on arches that
don't have an asm/efi.h header file.

This can happen for example if a driver that is built when COMPILE_TEST is
enabled selects the SYSFB symbol, e.g. on powerpc with allyesconfig:

drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or directory
29 | #include <asm/efi.h>
| ^~~~~~~~~~~

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Javier Martinez Canillas <[email protected]>
---

drivers/firmware/efi/sysfb_efi.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_efi.c
index 4c7c9dd7733f..7882d4b3f2be 100644
--- a/drivers/firmware/efi/sysfb_efi.c
+++ b/drivers/firmware/efi/sysfb_efi.c
@@ -26,8 +26,6 @@
#include <linux/sysfb.h>
#include <video/vga.h>

-#include <asm/efi.h>
-
enum {
OVERRIDE_NONE = 0x0,
OVERRIDE_BASE = 0x1,
--
2.36.1

2022-06-10 09:50:44

by Ard Biesheuvel

Subject: Re: [PATCH] efi: sysfb_efi: remove unnecessary <asm/efi.h> include

On Fri, 10 Jun 2022 at 11:00, Javier Martinez Canillas
<[email protected]> wrote:
>
> Nothing defined in the header is used by drivers/firmware/efi/sysfb_efi.c
> but also, including it can lead to build errors when built on arches that
> don't have an asm/efi.h header file.
>
> This can happen for example if a driver that is built when COMPILE_TEST is
> enabled selects the SYSFB symbol, e.g. on powerpc with allyesconfig:
>
> drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or directory
> 29 | #include <asm/efi.h>
> | ^~~~~~~~~~~
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Javier Martinez Canillas <[email protected]>

Queued up in efi/urgent, thanks

> ---
>
> drivers/firmware/efi/sysfb_efi.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_efi.c
> index 4c7c9dd7733f..7882d4b3f2be 100644
> --- a/drivers/firmware/efi/sysfb_efi.c
> +++ b/drivers/firmware/efi/sysfb_efi.c
> @@ -26,8 +26,6 @@
> #include <linux/sysfb.h>
> #include <video/vga.h>
>
> -#include <asm/efi.h>
> -
> enum {
> OVERRIDE_NONE = 0x0,
> OVERRIDE_BASE = 0x1,
> --
> 2.36.1
>