From patchwork Fri Nov 10 03:52:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13452672 X-Patchwork-Delegate: miriam.rachel.korenblit@intel.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A04CDC4332F for ; Fri, 10 Nov 2023 18:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229437AbjKJSVQ (ORCPT ); Fri, 10 Nov 2023 13:21:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345594AbjKJSSi (ORCPT ); Fri, 10 Nov 2023 13:18:38 -0500 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC3C1824E for ; Thu, 9 Nov 2023 22:58:39 -0800 (PST) Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-359472f74c5so6973175ab.0 for ; Thu, 09 Nov 2023 22:58:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1699599519; x=1700204319; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OZkVaBG0vteO7021P9A28Nc2SPcEoHes6KG3sccedrc=; b=SOVp0uEcJ9rw6KlxyIkt60ZxsuAVP16S4QZ27oVy2wA5HgqRfyLCRUsAYmD9xi9dgT 618TmNx9JvIrzIlokwIKb9iG5UHirwh10lORsJm+AjwABB9dP6p5huKs3bKzNSL1bFFe MzNH3LDSpM+dQM3kvH8IU6okxrFTOkoiQCel/vqdYRTRKsNH+RCgz1O6BDRrpvBTuvRh LUdiV6Vgv4PUn7LI3ZR52PTR1c+TO7HmSrEvnXOeuXXl1BLLWQBOm0Lw63F9mK7rquLY 6aycoFp6Xr/u1u6nXXd4pfxRjD96wEAS+eFB0LUrx1ZN/6vrjtDozODiV5U+EOtzVDWy hWWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699599519; x=1700204319; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OZkVaBG0vteO7021P9A28Nc2SPcEoHes6KG3sccedrc=; b=HAFM9+L0rWFAW7wuNbZhudSflwnm3B+srhGy8fo5BXlBeycq9wnP1XfIkYzxpHTcwm MlDzBdmznC8Cpxe5BHtSuGK/tf/K5SIHJE9Y9j85QVqYVLuIFzUNmHxbty9cbs47cEC3 Q/bM/lQhkWgP6Hgnbox5TxFMWyunoGNmS2lAk+y3VByZSgDH0k2N4ItpMM0qk54lPDqs C/zKl/0/S0YDc84sslb7EfJ3Iz6NgSea4thpmFmy8+ilWOMNBuZqlsoEhsKmJ9jhooKC UbvDNwB4a0KbH3kRvqn0TCwe0HWpbKMyHPb3iGsx+SdnfZUNbAmFveect9wlQ2uUthrn ga6A== X-Gm-Message-State: AOJu0YyyxNmCJ+7JpgG1MHQyz4fy0EsZUbIBlMNS25Xhjpb8agW5bK/m 6L2nLMSnnnaaWtz6ktYPoLS42mYO1VgSlBfS0ERl2g== X-Google-Smtp-Source: AGHT+IHzUkskBvz7HGScU42uWeC4Dc9zc0SH/QAjzmC+CEGdzduzni4Fc5/WgCHXiLlaS0Owh+jM3Q== X-Received: by 2002:a17:902:6547:b0:1ca:abe:a08b with SMTP id d7-20020a170902654700b001ca0abea08bmr5289987pln.68.1699588381511; Thu, 09 Nov 2023 19:53:01 -0800 (PST) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id c4-20020a170902c1c400b001c61e628e9dsm4301857plc.77.2023.11.09.19.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 19:53:01 -0800 (PST) From: Sunil V L To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Gregory Greenman , Kalle Valo , Palmer Dabbelt , Conor Dooley , Andrew Jones , Johannes Berg , Sunil V L , kernel test robot Subject: [PATCH v2] wifi: iwlwifi: Fix build warning when DMI is not enabled Date: Fri, 10 Nov 2023 09:22:55 +0530 Message-Id: <20231110035255.2925292-1-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 warnings by printing "" when DMI interface returns NULL. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202311040602.sCjU3UXr-lkp@intel.com/ Signed-off-by: Sunil V L --- Changes since v1: 1) Modified the fix not to add dependency on DMI in Kconfig as per feedback from Johannes. drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c index b96f30d11644..8cbb426f97e0 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c @@ -1273,7 +1273,7 @@ bool iwl_acpi_is_ppag_approved(struct iwl_fw_runtime *fwrt) if (!dmi_check_system(dmi_ppag_approved_list)) { IWL_DEBUG_RADIO(fwrt, "System vendor '%s' is not in the approved list, disabling PPAG.\n", - dmi_get_system_info(DMI_SYS_VENDOR)); + dmi_get_system_info(DMI_SYS_VENDOR) ?: ""); fwrt->ppag_flags = 0; return false; } diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index 329c545f65fd..e0c519daffe2 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c @@ -882,7 +882,7 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, le16_to_cpu(rsp->block_list[i])); pos += scnprintf(pos, endpos - pos, "\nOEM name: %s\n", - dmi_get_system_info(DMI_SYS_VENDOR)); + dmi_get_system_info(DMI_SYS_VENDOR) ?: ""); pos += scnprintf(pos, endpos - pos, "\tVendor In Approved List: %s\n", iwl_mvm_is_vendor_in_approved_list() ? "YES" : "NO"); pos += scnprintf(pos, endpos - pos, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 403bd17b8b7a..c11ecb372dbc 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -1231,7 +1231,7 @@ static void iwl_mvm_tas_init(struct iwl_mvm *mvm) if (!iwl_mvm_is_vendor_in_approved_list()) { IWL_DEBUG_RADIO(mvm, "System vendor '%s' is not in the approved list, disabling TAS in US and Canada.\n", - dmi_get_system_info(DMI_SYS_VENDOR)); + dmi_get_system_info(DMI_SYS_VENDOR) ?: ""); if ((!iwl_mvm_add_to_tas_block_list(cmd.v4.block_list_array, &cmd.v4.block_list_size, IWL_TAS_US_MCC)) || @@ -1245,7 +1245,7 @@ static void iwl_mvm_tas_init(struct iwl_mvm *mvm) } else { IWL_DEBUG_RADIO(mvm, "System vendor '%s' is in the approved list.\n", - dmi_get_system_info(DMI_SYS_VENDOR)); + dmi_get_system_info(DMI_SYS_VENDOR) ?: ""); } /* v4 is the same size as v3, so no need to differentiate here */