From patchwork Fri Jul 14 18:56:11 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: 120430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2441660vqm; Fri, 14 Jul 2023 04:41:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlFCcLe/yRzTwa28eQ49BihXfkiAYZtZwb5Ws5DRW6ERJQTvJwaxFzBUKgPJI+wR4ZVOOZV1 X-Received: by 2002:a05:6830:1e9a:b0:6b9:3f64:4e8c with SMTP id n26-20020a0568301e9a00b006b93f644e8cmr4583100otr.9.1689334886074; Fri, 14 Jul 2023 04:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689334886; cv=none; d=google.com; s=arc-20160816; b=cf1QQYOWq9AE28EkJCKG4WFPyijb529UN1yrI1YoiozDSCTdW/aLkQQeABaoDTjTo5 YN0VC2hrhtkl9sVa1t/qG9vLHRjqcABKmSYJdnF18rocdiMwuA+Vw7MliD/hmVGN3nsE 19PbnyOyrJFGNI8PlqumILuqk1SkVGVeZwDWPvt8VEyhFXPEyhuM6HoPhJJ/B+FZLmdN U2Q+NyPp7HXf/MMB54ed+GxHeyANrewNsxKDf2Z9Q8X48/3IEsMQMne70hMP9aupFSGI qJzo1gCGF+EOWvlqkjkQXCZwmMsBhRY9HJDA0MKkxG7RFyt0i4syabcqjBGPdXqcO+F9 YhxQ== 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=1dV1Ba2kL+u8sDFskbPce2IOsqdxydAsERzygQrE+dA=; fh=iLu8mJV3L09dzJN6VXkKj+SRT/C9p8fR4gJYErWu4bc=; b=akCVTttRihof5Fer6tTc5lAe26YKAI5h0oDOXi7SuGeCIplaSKBHnr6BE0WifAQeLy Qb+q7cXSSLm5VPHN5EQG8SLn5rsEpBsC72K858z/jYbu4fF2shIIEurIHNlBAMHel37t B04TltYWU7b3j4tqKATuk+Phc73DW2xMpkDGIeuO4FCCsVdxFuTitkTxFRatOQ5BWVfQ HMs9KRYn4cZMdOWYhlTDuEnZRXLPVK6m1nINFofH2mmmXi95ve9wOqpz8UdYg68Uypco rGY/6AblrEoyysPsdzQylISFyb/G7IU9jAqiII5mLB7LlmD3vRAE/0CrKrf7/DV2H1sR KRVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ieuctSct; 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 z68-20020a636547000000b0055ba896ec95si1767387pgb.779.2023.07.14.04.41.10; Fri, 14 Jul 2023 04:41:26 -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=ieuctSct; 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 S236282AbjGNK4F (ORCPT + 99 others); Fri, 14 Jul 2023 06:56:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236279AbjGNKzj (ORCPT ); Fri, 14 Jul 2023 06:55:39 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC5763590; Fri, 14 Jul 2023 03:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689332136; x=1720868136; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6Hi0/au1Z7W8Ae3bYV68XGhs74D1joYSt9bHUr1c1ng=; b=ieuctSct5b0ZXSF1M9T2c12hV5Mt/KqbZMDAn7nLX5D7xC7H+V9yCl7d LTOcq0i202tvB19LnajvtYBd5CrYxKW5KtCXEW0n0qVEylojBH1WIT7Tl x6JNF4pMsBH+rtiAa0YKkuaFGJs1qY9y1c0V/bbWTrkzGYMpzVIhX/GJ9 aAjW/TQJywmEXJ6LFyH9zX2PH8Tkdm6Rn0HnhKb3sSKZl9uXO/H+JnEyR bX0ls8O03Z+LvwBdkBALG5VpmKXRP4sqaPX+aHLcvJvBTKogq7QYQCXaF NxfVkzg4DpGCYNNCWWvrzN6jAygxGXMYfVfhxMSuTj062ai970Q960mZV Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="364321224" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="364321224" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 03:55:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="722365558" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="722365558" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2023 03:55:33 -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?= , Andy Shevchenko Subject: [PATCH v2 11/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Fri, 14 Jul 2023 20:56:11 +0200 Message-Id: <20230714185615.370597-12-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714185615.370597-1-amadeuszx.slawinski@linux.intel.com> References: <20230714185615.370597-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: 1771394463078298636 X-GMAIL-MSGID: 1771396017679159014 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 Reviewed-by: Andy Shevchenko Signed-off-by: Amadeusz Sławiński --- 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);