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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250107235312.236247-1-rdunlap@infradead.org>
Date: Tue,  7 Jan 2025 15:53:09 -0800
From: Randy Dunlap <rdunlap@...radead.org>
To: linux-kernel@...r.kernel.org
Cc: Randy Dunlap <rdunlap@...radead.org>,
	kernel test robot <lkp@...el.com>,
	David Rheinsberg <david@...dahead.eu>,
	Hans de Goede <hdegoede@...hat.com>,
	Javier Martinez Canillas <javierm@...hat.com>,
	Peter Jones <pjones@...hat.com>,
	Simona Vetter <simona@...ll.ch>,
	linux-fbdev@...r.kernel.org,
	Ard Biesheuvel <ardb@...nel.org>,
	linux-efi@...r.kernel.org
Subject: [PATCH] efi: sysfb_efi: fix W=1 warnings when EFI is not set

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@...radead.org>
Reported-by: kernel test robot <lkp@...el.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501071933.20nlmJJt-lkp@intel.com/
Cc: David Rheinsberg <david@...dahead.eu>
Cc: Hans de Goede <hdegoede@...hat.com>
Cc: Javier Martinez Canillas <javierm@...hat.com>
Cc: Peter Jones <pjones@...hat.com>
Cc: Simona Vetter <simona@...ll.ch>
Cc: linux-fbdev@...r.kernel.org
Cc: Ard Biesheuvel <ardb@...nel.org>
Cc: linux-efi@...r.kernel.org
---
 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)