[PATCH] efi: sysfb_efi: fix build when EFI is not set

[Thomas Zimmermann]

Hi

Am 27.07.21 um 07:04 schrieb Randy Dunlap:
> When # CONFIG_EFI is not set, there are 2 definitions of
> sysfb_apply_efi_quirks(). The stub from sysfb.h should be used
> and the __init function from sysfb_efi.c should not be used.
> 
> ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’
>   __init void sysfb_apply_efi_quirks(struct platform_device *pd)
>               ^~~~~~~~~~~~~~~~~~~~~~
> In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0:
> ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here
>   static inline void sysfb_apply_efi_quirks(struct platform_device *pd)
>                      ^~~~~~~~~~~~~~~~~~~~~~
> 
> Signed-off-by: Randy Dunlap <rdunlap at infradead.org>
> Cc: Ard Biesheuvel <ardb at kernel.org>
> Cc: linux-efi at vger.kernel.org
> Cc: dri-devel at lists.freedesktop.org
> Cc: Javier Martinez Canillas <javierm at redhat.com>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: Mark Brown <broonie at kernel.org>
> Cc: linux-next at vger.kernel.org

Thanks for the patch. It should have a fixes line

 > dim fixes 8633ef82f101c040427b57d4df7b706261420b94

Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer 
setup for all arches")


... and maybe a few more of the CCs below

Cc: Javier Martinez Canillas <javierm at redhat.com>

Cc: Borislav Petkov <bp at suse.de>

Cc: Daniel Vetter <daniel.vetter at ffwll.ch>

Cc: Thomas Zimmermann <tzimmermann at suse.de>

Cc: Ard Biesheuvel <ardb at kernel.org>

Cc: Paul Walmsley <paul.walmsley at sifive.com>

Cc: Palmer Dabbelt <palmer at dabbelt.com>

Cc: Albert Ou <aou at eecs.berkeley.edu>

Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

Cc: Linus Walleij <linus.walleij at linaro.org>

Cc: Krzysztof Kozlowski <krzysztof.kozlowski at canonical.com>

Cc: John Stultz <john.stultz at linaro.org>

Cc: Colin Ian King <colin.king at canonical.com>

Cc: Nicolas Saenz Julienne <nsaenz at kernel.org>

Cc: Sudeep Holla <sudeep.holla at arm.com>

Cc: Maxime Ripard <maxime at cerno.tech>

Cc: linux-efi at vger.kernel.org

Cc: linux-riscv at lists.infradead.org


Best regards
Thomas

> ---
>   drivers/firmware/efi/sysfb_efi.c |    2 ++
>   1 file changed, 2 insertions(+)
> 
> --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c
> +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c
> @@ -332,6 +332,7 @@ static const struct fwnode_operations ef
>   	.add_links = efifb_add_links,
>   };
>   
> +#ifdef CONFIG_EFI
>   static struct fwnode_handle efifb_fwnode;
>   
>   __init void sysfb_apply_efi_quirks(struct platform_device *pd)
> @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc
>   		pd->dev.fwnode = &efifb_fwnode;
>   	}
>   }
> +#endif
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210727/7c0d6c1f/attachment.sig>