Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp36797933rwd; Tue, 11 Jul 2023 06:01:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlE76CYSEFoOrwY66+EivzasB0ue7pTGMgyYbr4lyRCk+MrtXWl8EzpKQJ9udLsC+76b9HqG X-Received: by 2002:a05:651c:1027:b0:2b6:cf18:7397 with SMTP id w7-20020a05651c102700b002b6cf187397mr12859596ljm.5.1689080464813; Tue, 11 Jul 2023 06:01:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689080464; cv=none; d=google.com; s=arc-20160816; b=E9ML3K5x7DhS41SDmH/MAz0nvRgG5nmC6ieadwi9dYn6THr+TWkcJr28Q/yfkYt5cz Xi1T2AEnRzvhjuMHnGeaEm8Be1eQt51nCi6FzsOi+sWcGdL2R8HjfaoRqzsgbmhyEvGh 28g0M2L2nQCYez8wTznOnUhwtPA0YDj+Vo9xvSmM04CUlaWJHcnwv59r4Uvkm5wl5U5S 9U0v+VJLU2qVBz9zii1WsryLrtlbKoRvQXIeOVRNyG7wp7EBRj73uMSsQ1Ufa9pho5l9 LCyeyu1ALdpmxuT956EkNLwnOVKY47TVEDY36+7dTpsn9G7zStmOs2Yh3ttjkZntqlB7 ptcw== 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=UEhupczK9nQ61fZXq6pxu6plZbClqsjbg3QiIV/Sf1A=; fh=sKxO7Xj+YIOQJw2gBVYevujm0+5GA4/lF0Hs7SAhyQ0=; b=uBTL+MYSjuhThU309/q0/ZXOiNIk0ytXvd1fuy9qg7YFDJAhcpT+GJfQ66CyyX+Ni+ McAE0JQfWoprKfjPhWMXJSPsIe9nJ4KOT31tRSD9A6eBF932+8CjXZt/uV9KJORDxF/V 0JecVfUrmrk17i8zSWOE6VAaGH0jD0N9XkSy9gjYfVGW5aQISSrTKjJF99VPjoqy0t9O jKBrQBRY+ZCc3IMm9z0y1nVwnf2LqnFzHRtFu/pRBpA2cQGz/S9yzQ4Awz6bxl5odTlf 2r0NBx7a/y7YYwrJd8iqyMEzBHIPRCiKGvEA7NgUey9V8w2qQUHAaDo/hp+xjFXACRqT vvrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Q49qXIcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 h14-20020a170906110e00b00974fb8ff39asi2197064eja.580.2023.07.11.06.00.35; Tue, 11 Jul 2023 06:01:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=Q49qXIcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S231950AbjGKM5k (ORCPT + 99 others); Tue, 11 Jul 2023 08:57:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231441AbjGKM5f (ORCPT ); Tue, 11 Jul 2023 08:57:35 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1556698; Tue, 11 Jul 2023 05:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689080245; x=1720616245; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vinqnO46VRRCtcTS7KWV2T0847JFuBFICYgZjG0DVDI=; b=Q49qXIcyF7QsCQoLM4RmiKzksMsG0wAzohNmYV3X4+iGryHbcrApXbHR WxDDnfOyZZetyl2/KTEaCDf9CwbI5y1zfmTtYg5C6srE7X/ga9BANqZuu QVyH7B2mLaoJWfYh5H5EGUf848oo85un/8RBFeR7gq8mSZBvYkJHKGD7/ BMMf4AjYzXSxxDTj+eAN33GEMHx0bCa2MTtx+BG79eZ3YgzCUdCIQbWBl zuEGnPvrKK3/w93nHdhUlQPDMtf18DlPVDnlWD8PMCGasosCflfi5oGAY pJq6MMDw3iSGo72grC7aXMXCnV0euyZfWkr9kyErpfjxEhFkLNS1mW5K0 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="367187400" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="367187400" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2023 05:57:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="834666551" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="834666551" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga002.fm.intel.com with ESMTP; 11 Jul 2023 05:57:16 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Bjorn Helgaas , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , Kai Vehmanen , Andy Shevchenko , Hans de Goede , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 04/13] ALSA: hda: Use global PCI match macro Date: Tue, 11 Jul 2023 14:57:17 +0200 Message-Id: <20230711125726.3509391-5-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> References: <20230711125726.3509391-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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-kernel@vger.kernel.org Instead of using local macro to match PCI device, use global one. Signed-off-by: Amadeusz Sławiński --- sound/pci/hda/hda_intel.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef831770ca7d..143efa54b9bf 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -330,18 +330,6 @@ enum { #define needs_eld_notify_link(chip) false #endif -#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) && \ - (((pci)->device == 0x0a0c) || \ - ((pci)->device == 0x0c0c) || \ - ((pci)->device == 0x0d0c) || \ - ((pci)->device == 0x160c) || \ - ((pci)->device == 0x490d) || \ - ((pci)->device == 0x4f90) || \ - ((pci)->device == 0x4f91) || \ - ((pci)->device == 0x4f92))) - -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) - static const char * const driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", [AZX_DRIVER_PCH] = "HDA Intel PCH", @@ -573,7 +561,7 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset) snd_hdac_set_codec_wakeup(bus, false); /* reduce dma latency to avoid noise */ - if (IS_BXT(pci)) + if (HDA_CONTROLLER_IS_APL(pci)) bxt_reduce_dma_latency(chip); if (bus->mlcap != NULL) @@ -2175,7 +2163,7 @@ static int azx_probe(struct pci_dev *pci, #endif /* CONFIG_SND_HDA_PATCH_LOADER */ #ifndef CONFIG_SND_HDA_I915 - if (CONTROLLER_IN_GPU(pci)) + if (HDA_CONTROLLER_IN_GPU(pci)) dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n"); #endif @@ -2283,7 +2271,7 @@ static int azx_probe_continue(struct azx *chip) * for other chips, still continue probing as other * codecs can be on the same link. */ - if (CONTROLLER_IN_GPU(pci)) { + if (HDA_CONTROLLER_IN_GPU(pci)) { dev_err(chip->card->dev, "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n"); goto out_free; @@ -2294,7 +2282,7 @@ static int azx_probe_continue(struct azx *chip) } /* HSW/BDW controllers need this power */ - if (CONTROLLER_IN_GPU(pci)) + if (HDA_CONTROLLER_IN_GPU(pci)) hda->need_i915_power = true; } -- 2.34.1