Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2439782rwd; Wed, 14 Jun 2023 02:54:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7984r/2LQo8vYdmE2MrvhWvrElCzx4asoOZGxEKrfKp9o49rXZb4MYMtlDJSmey+XR/VFR X-Received: by 2002:a05:6a21:78a6:b0:10f:be0:4dce with SMTP id bf38-20020a056a2178a600b0010f0be04dcemr1450277pzc.8.1686736459273; Wed, 14 Jun 2023 02:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686736459; cv=none; d=google.com; s=arc-20160816; b=fS+IQUPFZ7/alsFgtLZ0xkHx4TbfT2v7vzUzvCnaxLFP/sg9rUzt9LT2Ummq5SXn6b g9S+SMjG0kipjvA4rm7jssuZRV6ULa/b/Al+0kmIy0KxntqBWFVO8tPWpeg963jgtWJL NR6ZBKgzZtsSrod35/GYCP+KqwT3f0dCOs0OLw3NAn9wYl+VKtQPWdJ8RGQrJ807SfmV bl4zs9T8ZEt3H8hz1mGcGcmZt2mC0cgTT5egbMAW6UJ4wiYSW0tDA3V67VJWPH5OS10d PwLKnSRqcq6X883Mc2IIyGFR9GC/ZymxP6gzz4bX1OvGO4siILfi8Oc//+aUcdKLhHDC ASNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Zz3v/lCMoK4WOF4dpL8UXbo9AexKvyV0w0vrXE2E2/I=; b=GwAAZXmanuzKPuYRyNg6RR4/ULyNCvgACkraQrzAaPIhtJkziXFvFMJ5RQh0jD3Gyk rzC2bPl+QiBUidqhCZivOv3tnZ+I/azjrufnsirdpo+bgXyJH+hMr2+ghrnEOjEzyo9s ubvq5Ox/JIiGZXRw9T4q/8JdHvSUbG4WDQzF9ffVodc7LYlzZbzLdricw70Er44t19Ka nNw2MnOulbgdeEHyavNDeMaF0wDz7QtBgXX8p//WUQdwRYB4FuAM6JRnlY+POqhVHVSZ uMNleSLDVesi1eD0vCqvjOlOMdcwwZ8yxG9ER/b6ApEQ+lOssolmhP/x0WQicWyvFXBe zKBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CNt5i6Rs; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k18-20020aa79d12000000b00655079704afsi10355334pfp.119.2023.06.14.02.54.12; Wed, 14 Jun 2023 02:54:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CNt5i6Rs; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244183AbjFNJph (ORCPT + 62 others); Wed, 14 Jun 2023 05:45:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244258AbjFNJoi (ORCPT ); Wed, 14 Jun 2023 05:44:38 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 232CA1FC8 for ; Wed, 14 Jun 2023 02:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686735799; x=1718271799; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=49sfTHTEHroSKe7ZnRAv7fUyYGbPbhjN3syiSGFoZjk=; b=CNt5i6RshzTn9WtQYDaab6bWum13Ry93JKCme2Z4WLreobZkomRozz9H 16/3j//cFVtGQBVmKruRhxg3dH2Y83pwNbZl+0/f7wWZ/LcjpWOC9ndcD zIh0exJgcpNj5zePumHnfi6JJGECMZhpveePxvh0Y7DDFxe97Ng32WSay xR7Qugo5ZonO5IQMW3w9x9nPs2OIRea4RPGgdBTrmWiN5A1SU8Bwqex6V B99a8Q696Yd8LGnxga2mnFxgj+Q5O/N6QP9rNkUSoTDmfCxu5aPtinvak /0OOxUxcABvXj7jT5y6Mj09VQMFjbV1pNRM6yUyJeo7raK9OtHzi1uYFG Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="361049823" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="361049823" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 02:42:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="711989806" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="711989806" Received: from basharil-mobl.ger.corp.intel.com (HELO ggreenma-mobl2.lan) ([10.214.203.45]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 02:42:02 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Gregory Greenman Subject: [PATCH 04/20] wifi: iwlwifi: mvm: use iwl_mvm_is_vendor_in_approved_list() Date: Wed, 14 Jun 2023 12:41:21 +0300 Message-Id: <20230614123446.f3741f5cdef4.I5e0bf522189dc595ee38d05e93994211d32ec0f4@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230614094137.379897-1-gregory.greenman@intel.com> References: <20230614094137.379897-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg We have this helper now instead of open-coding the check for the dmi_tas_approved_list, so use it even here. It was added for debugfs use, but it's better to be consistent. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman --- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index ed9370aac1b6..8d8277d94f56 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -1182,7 +1182,7 @@ static void iwl_mvm_tas_init(struct iwl_mvm *mvm) if (ret == 0) return; - if (!dmi_check_system(dmi_tas_approved_list)) { + 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)); -- 2.38.1