From patchwork Tue Jul 11 12:57:22 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: 118523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp478061vqm; Tue, 11 Jul 2023 06:26:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlGso6C/U26+I3RPUK6KK3NZrUsY9AaR+gGgMnScSJADauXByZEuacY4z1fBCteuWJSujsJl X-Received: by 2002:a05:6a00:2341:b0:67a:8fc7:1b4e with SMTP id j1-20020a056a00234100b0067a8fc71b4emr13994070pfj.4.1689082004783; Tue, 11 Jul 2023 06:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689082004; cv=none; d=google.com; s=arc-20160816; b=x14byldJ0EzO503g9s2FKdXPFbxCebsLSzAB+Ft008LDj/UmXIwElvMQ3er8+dmqf+ UuLJFXP57ZR73GukNtNeCwavsWzM3qVW8+kdlpRyGoC1y2g5pSuWT32h6pm2Eol+pGmR 9OyZLNCCiNXNOUAN4Ivw89N167FQhzAGZz/h5lAjtpL5jRVWBZO+P3T7A3ryv9a83xBM tYDl2RPa4vG1oHQRL53AA7FVAep0r0Z5OnJTyh/6LaBT/bSb5+bCah5x4QHxE0flpg6k NMGxrfoe3CEmWEv1SwUerAW7M80B8e0lWt2aKCfVrRI5t0d24UPoakHzN/vUOixlJjW4 BzGA== 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=xPc+sGU2qS0FR/rVt60k/DMUyKtC+zSVXt6wcVWnpbE=; fh=sKxO7Xj+YIOQJw2gBVYevujm0+5GA4/lF0Hs7SAhyQ0=; b=x5o4l1gbZU+XHHgoNNMCnJ8mEOr9J8anxbvCVj7j8ajSuqO1OAipwe1OihzG1TyHGd elyXXR6Cgq8/pDJbMb0GKMaBMjayTWgQd9+ZkcEXxyM0I2MgNgivbRPF1I5MIbeGerSF HEMmLD/wMKirED4MT5GU5qJAEAy3b1miiZTKy3oPwyJSUAynEVGV2qlfJrbCn3rvxUfs P56zisDtxumqED/keMNlHB7kpjHQbD7bvv9Tx8sqMHfvER86r0nUred0qFaDHjgbZ96N GIR5ZTrSeoNG+ZPrsdP/wJdnvZ9I56Klj9IB83EDP87v+c1PRChQ5jfc23CgmFEHcjqh Vycg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CKszODrI; 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 x19-20020a056a00189300b0067a4b6093a8si1550687pfh.29.2023.07.11.06.26.30; Tue, 11 Jul 2023 06:26:44 -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=CKszODrI; 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 S232939AbjGKM7W (ORCPT + 99 others); Tue, 11 Jul 2023 08:59:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232841AbjGKM66 (ORCPT ); Tue, 11 Jul 2023 08:58:58 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 354BF19A2; Tue, 11 Jul 2023 05:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689080323; x=1720616323; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bl/zYgzCi3o2blRR5uBjNAGlQOwq1q6m2wvBNMtj8IM=; b=CKszODrILKgapBm45v/fZ/OsrMHt1EedoEngU4XDL2HE0dkC48GoN/zx VwIk5O1VOKcHjnJnxCK7xYsbG7T4xn2UeROeuWvTOa5t9XokmfsTzSDZ6 1zE1cW9Q6CFhHogmMXrnqAMdT/etDQAUv54bx/qSIY/HqQ9PDfUa2Hfc/ kGHgGlwUW9GmMtTRr0B5fcHzKs2TuY55hMU67Xm35YCItIGE2/waxRYyp iZbZWsZ9O1825f6WLIfnmJuyFl3erx4RSoBe3G2JV8fxB8wLT9WRunAia 4eWdnePmD+e3I6ERKXNcjTJROEItL8bhsKfLtp2AMKSx/Ea7jqiFRTVgW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="367187501" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="367187501" 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:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="834666738" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="834666738" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga002.fm.intel.com with ESMTP; 11 Jul 2023 05:57:30 -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 , Hans de Goede , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 09/13] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Tue, 11 Jul 2023 14:57:22 +0200 Message-Id: <20230711125726.3509391-10-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 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771130852398277377 X-GMAIL-MSGID: 1771130852398277377 Use PCI device IDs from pci_ids.h header and while at it change to using PCI_DEVICE_DATA() macro, to simplify declarations. Acked-by: Mark Brown Signed-off-by: Amadeusz Sławiński Reviewed-by: Andy Shevchenko --- sound/soc/intel/avs/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 637501850728..859b217fc761 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = { }; static const struct pci_device_id avs_ids[] = { - { PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */ - { PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */ - { PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */ - { PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */ - { PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */ - { PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */ - { PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */ - { PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */ + { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) }, + { PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) }, { 0 } }; MODULE_DEVICE_TABLE(pci, avs_ids);