Re: [PATCH] efi: sysfb_efi: fix W=1 warnings when EFI is not set

[Thomas Zimmermann]

Am 08.01.25 um 00:53 schrieb Randy Dunlap:
> A build with W=1 fails because there are code and data that are not
> needed or used when CONFIG_EFI is not set. Move the "#ifdef CONFIG_EFI"
> block to earlier in the source file so that the unused code/data are
> not built.
>
> drivers/firmware/efi/sysfb_efi.c:345:39: warning: ‘efifb_fwnode_ops’ defined but not used [-Wunused-const-variable=]
>    345 | static const struct fwnode_operations efifb_fwnode_ops = {
>        |                                       ^~~~~~~~~~~~~~~~
> drivers/firmware/efi/sysfb_efi.c:238:35: warning: ‘efifb_dmi_swap_width_height’ defined but not used [-Wunused-const-variable=]
>    238 | static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = {
>        |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/firmware/efi/sysfb_efi.c:188:35: warning: ‘efifb_dmi_system_table’ defined but not used [-Wunused-const-variable=]
>    188 | static const struct dmi_system_id efifb_dmi_system_table[] __initconst = {
>        |                                   ^~~~~~~~~~~~~~~~~~~~~~
>
> Fixes: 15d27b15de96 ("efi: sysfb_efi: fix build when EFI is not set")
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Closes: https://lore.kernel.org/oe-kbuild-all/202501071933.20nlmJJt-lkp@xxxxxxxxx/
> Cc: David Rheinsberg <david@xxxxxxxxxxxx>
> Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
> Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
> Cc: Peter Jones <pjones@xxxxxxxxxx>
> Cc: Simona Vetter <simona@xxxxxxxx>
> Cc: linux-fbdev@xxxxxxxxxxxxxxx
> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx>
> Cc: linux-efi@xxxxxxxxxxxxxxx

Reviewed-by: Thomas Zimmermann <tzimmermann@xxxxxxx>

> ---
>   drivers/firmware/efi/sysfb_efi.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20250106.orig/drivers/firmware/efi/sysfb_efi.c
> +++ linux-next-20250106/drivers/firmware/efi/sysfb_efi.c
> @@ -91,6 +91,7 @@ void efifb_setup_from_dmi(struct screen_
>   		_ret_;						\
>   	})
>   
> +#ifdef CONFIG_EFI
>   static int __init efifb_set_system(const struct dmi_system_id *id)
>   {
>   	struct efifb_dmi_info *info = id->driver_data;
> @@ -346,7 +347,6 @@ 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(void)

--
--
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)