diff mbox series

wifi: iwlwifi: Fix warning by adding dependency on DMI

Message ID 20231109054027.2870124-1-sunilvl@ventanamicro.com
State New
Headers
Series wifi: iwlwifi: Fix warning by adding dependency on DMI |

Commit Message

Sunil V L Nov. 9, 2023, 5:40 a.m. UTC 
  This driver currently assumes CONFIG_DMI is enabled along with ACPI.
This may not be true. Due to this, the kernel test bot reports new
warning like below for RISC-V allyesconfig builds.

>> drivers/net/wireless/intel/iwlwifi/fw/acpi.c:1190:25:
warning: '%s' directive argument is null [-Wformat-overflow=]

1190 | "System vendor '%s' is not in the approved list, disabling PPAG.\n",

Fix the warning by adding dependency on CONFIG_DMI.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202311040602.sCjU3UXr-lkp@intel.com/
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Johannes Berg Nov. 9, 2023, 9:09 a.m. UTC | #1 
On Thu, 2023-11-09 at 11:10 +0530, Sunil V L wrote:
> This driver currently assumes CONFIG_DMI is enabled along with ACPI.
> This may not be true. Due to this, the kernel test bot reports new
> warning like below for RISC-V allyesconfig builds.
> 
> > > drivers/net/wireless/intel/iwlwifi/fw/acpi.c:1190:25:
> warning: '%s' directive argument is null [-Wformat-overflow=]
> 
> 1190 | "System vendor '%s' is not in the approved list, disabling PPAG.\n",
> 
> Fix the warning by adding dependency on CONFIG_DMI.
> 

Not sure that's the right fix - why not put checks in the code there?

Is it just a build warning?

maybe

-dmi_get_system_info(DMI_SYS_VENDOR)
+dmi_get_system_info(DMI_SYS_VENDOR) ?: "<unknown>"

johannes
Sunil V L Nov. 9, 2023, 3:11 p.m. UTC | #2 
On Thu, Nov 09, 2023 at 10:09:53AM +0100, Johannes Berg wrote:
> On Thu, 2023-11-09 at 11:10 +0530, Sunil V L wrote:
> > This driver currently assumes CONFIG_DMI is enabled along with ACPI.
> > This may not be true. Due to this, the kernel test bot reports new
> > warning like below for RISC-V allyesconfig builds.
> > 
> > > > drivers/net/wireless/intel/iwlwifi/fw/acpi.c:1190:25:
> > warning: '%s' directive argument is null [-Wformat-overflow=]
> > 
> > 1190 | "System vendor '%s' is not in the approved list, disabling PPAG.\n",
> > 
> > Fix the warning by adding dependency on CONFIG_DMI.
> > 
> 
> Not sure that's the right fix - why not put checks in the code there?
> 
> Is it just a build warning?
> 
> maybe
> 
> -dmi_get_system_info(DMI_SYS_VENDOR)
> +dmi_get_system_info(DMI_SYS_VENDOR) ?: "<unknown>"
> 
Thanks!, Johannes. It is a build warning because of allyesconfig build.

Your suggestion works. I will send v2 with this solution.

Thanks,
Sunil
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig
index 20971304fdef..cbcd1dcced4d 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig
@@ -1,7 +1,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config IWLWIFI
 	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "
-	depends on PCI && HAS_IOMEM && CFG80211
+	depends on PCI && HAS_IOMEM && CFG80211 && DMI
 	depends on IWLMEI || !IWLMEI
 	select FW_LOADER
 	help