From patchwork Mon Jul 17 11:45:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 121243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1070586vqt; Mon, 17 Jul 2023 05:14:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlELjOtSmZnsnU8eq5otK21818hGFe/ZDtjIe56W+0viHH5m2IcjOEXqCUSJ0/2V1uCN4xZg X-Received: by 2002:a17:906:fad4:b0:993:d8a2:380 with SMTP id lu20-20020a170906fad400b00993d8a20380mr9925573ejb.21.1689596067171; Mon, 17 Jul 2023 05:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689596067; cv=none; d=google.com; s=arc-20160816; b=DAI8Xe/h58XWqt3CNdPosBssHkmCarF/0lh2zB9zrtXc0gCFMzDhRJvkyjfkORDuXO epfYg/U5B2QsdxInSkswHAQaNAlie/pSu85cdZ5j2x4ipYTURyedxHSFi27v7HxPOmjt UvqiZcO0Bv+yWNWdYj4SEdCUZ4V6k6flrGwId2qIoK6DIPvR3l68s2yeQXZDsopiCl9B exXaMBJTCni6cm06OXt21Mz9ZJNrK8Pcd70CvlhiplgB9m3par8PLIyTIWTLtLyMUMF5 CwGr35NdfwTRnJC9U1ekCbisiRjMUAw88rmeUC+Qc1herv6Jlbrun0QQculfDgY2GBW8 xMAw== 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=OHv1fMKurl2tMKtEj452IkO2QT5UkDSBsDEABgN4fX8=; fh=WYMxSBIzRoGpjokqDjpNyzs/ox+ow6sUuRoGJdpn/uA=; b=NJ+7ozkuWHVCQHkVzrF+P93njXGkrAzyMY45H86kAVpAB3W4oIHhGDW8F30Gh7L7Np e/UL4p+ypqCiCg5t7m++J+yOgcTY1+eY6YZINS8Vb7HVBwjq1/ffU/70Nfxw5J/+DabV bJjLyh01xsQ9BvMdghvk0xyssVFykImE+04Iyw7iHCDO3X+/xEZ6bQoqDJiI8CMqrHOZ nUzsKZOCaD3mJTXKwwJw5aYnPAYGjVwYKkeOOAwZsEYVg2486f8ETm2DhedJTCimI3+d BDSoCDUJA3i2332GcijzTkgxU7fzWt9O3Mxsv2GQycxe0xnV+q5p5oiY7B33xI14T1Uy RTpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LC8qAtoe; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga12-20020a170906b84c00b0098debb6fa67si13170929ejb.495.2023.07.17.05.14.02; Mon, 17 Jul 2023 05:14:27 -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=LC8qAtoe; 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 S229601AbjGQLrM (ORCPT + 99 others); Mon, 17 Jul 2023 07:47:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbjGQLrK (ORCPT ); Mon, 17 Jul 2023 07:47:10 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BADFD1BFB; Mon, 17 Jul 2023 04:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689594406; x=1721130406; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+YlPYl9D46pUnlZCp2j4XddAuRLCst0K7iLJIQCN+g0=; b=LC8qAtoeUwkLwRN/y9ss0nP6Z4/COeLDwQC8Nwr8NoTk5cj98olhtM8g UGlNcCGA8N0WaN9zB7s0cQLZDSPH0S0/zIkUviQNLgLu8TrDqkfhTZpCp D7Tu8OACF03CCt/AhOYLmC9HmwJ7ThhmjjyWuJW60jmFYLL1vbpVt6Qgn /byda26e34K2BuVxvX8K0rYr+BkW2pI2BsDJp+Sg19mkc2GiGt5VCxitp Arlm5+2EW6NF1PUIOb0BFUfSCKAad3E2GMpZbCHURWs7+0FjYFvwVpCPh YW5MHvve+p9IPr4S5rLybcuzw0Ls8fTxw5vrp9LXXP5NaYynQ83kSzvxD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="363372868" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="363372868" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 04:45:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="969856515" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="969856515" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga006.fm.intel.com with ESMTP; 17 Jul 2023 04:45:40 -0700 From: =?utf-8?q?Amadeusz_S=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 , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= , Andy Shevchenko Subject: [PATCH v4 07/15] ALSA: hda/i915: Use global PCI match macro Date: Mon, 17 Jul 2023 13:45:03 +0200 Message-Id: <20230717114511.484999-8-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230717114511.484999-1-amadeuszx.slawinski@linux.intel.com> References: <20230717114511.484999-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 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, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771669885821399470 X-GMAIL-MSGID: 1771669885821399470 Instead of using local macro to match PCI device, use global one. Reviewed-by: Andy Shevchenko Acked-by: Mark Brown Reviewed-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński --- sound/hda/hdac_i915.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 161a9711cd63..2a451ff4fe6a 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -11,11 +11,6 @@ #include #include -#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \ - ((pci)->device == 0x0c0c) || \ - ((pci)->device == 0x0d0c) || \ - ((pci)->device == 0x160c)) - /** * snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW * @bus: HDA core bus @@ -39,7 +34,7 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus) if (!acomp || !acomp->ops || !acomp->ops->get_cdclk_freq) return; /* only for i915 binding */ - if (!IS_HSW_CONTROLLER(pci)) + if (!HDA_CONTROLLER_IS_HSW(pci)) return; /* only HSW/BDW */ cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);