From patchwork Mon Jul 17 11:45:07 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: 121251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1076164vqt; Mon, 17 Jul 2023 05:25:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlHu1q1HYmMew28Z/IWNFVwEi5GGP1sipKhEpHc1KtOALes/r8lPPInPmYL+tJ/d+/JxEMrj X-Received: by 2002:aa7:d84f:0:b0:51e:309:2e12 with SMTP id f15-20020aa7d84f000000b0051e03092e12mr11819806eds.28.1689596699689; Mon, 17 Jul 2023 05:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689596699; cv=none; d=google.com; s=arc-20160816; b=MiNj24+6rRX1zgKcExgA35xVwf9a+wJ2t7hkjg22QLzRTnRAEo9vYYNKTWHXhkgJbT +mi/Xa3zDVDxUH1LGmevWDUgiW8uc2jYDLoY5WggPn7MgLuCxKvBYlGit7krwNLNtaiW 90+PUuOAzsKitYPaEuNHGYzo3P4fynAaD3by4vBkvHNyyCQDCJ78ojbfWXfiwynSP99q JIXOLbxL56MDIM50/idsPwJTtiuaZ/fnBNaDIpJh5nnZOd7bG0+/7Ca6SWz4YFkj/sY1 NxygQJcamJqjxGzUa8OHAGKtdsq69nrWNe54GeWLFgfYK0H9UP8pBcQzrPlynJEJalKr QMxw== 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=2/9cvrComeLldwU2x16aeiz+nWWNdIiZBS+vhGq2omg=; fh=WYMxSBIzRoGpjokqDjpNyzs/ox+ow6sUuRoGJdpn/uA=; b=p8DZAJGiD2owIfjYcd5JAYzYeanovGFhsq1f6Viz7Vu11Q/fTORvSEAjEA/9Uw2K4+ q/HYNLdJYaGFCievNJEXYGZBlqPdc285fH+bBYbSxAtRkRORwpDy6w1RaNdGbrbeErOH pUr0Hz872UbeqjG82Xr1rMoHzfvtC1HPgAqcvN2Wf5edcTLFNNnS4gmti8aaLjibkI8a yzr8QCcWn96LysBwj4RlM0QzEufAx0MjLCBfc8AIKM9SHA5mXo3QV7+DD7imOZKKwmn4 BAnlrdCPK2tdtxuJxxTabU8PRj2CWCA0IQmPj/9AczyhFubKFmUDOnZAL4rtkPtIXabZ cN6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bq5z91Ty; 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 f22-20020a056402161600b0051e0d950edbsi13731300edv.296.2023.07.17.05.24.36; Mon, 17 Jul 2023 05:24:59 -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=bq5z91Ty; 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 S230288AbjGQLsT (ORCPT + 99 others); Mon, 17 Jul 2023 07:48:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229917AbjGQLsQ (ORCPT ); Mon, 17 Jul 2023 07:48:16 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66F9419B7; Mon, 17 Jul 2023 04:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689594476; x=1721130476; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jCO27bVnXFdR65FCHTCbaKN7p49D6hdVlHxsZ9RVsuI=; b=bq5z91TyO2eP02+t94SIJCuioHbE2mLY3MJWNh7EeUDio9qZFkIu6FlI KZtZyUq3qoQ5oFAF4yThDjDBHWJSJuIiit5N49IHL4asVTQaAGuNqzzif iuDrjnc4zMjNAQJc+kdP1VUOdVozD51mdPj+6jBpKLHI2euzkOowgn+/K wsuvy4YCJjBo4A9pX6j1J6PuYJECt+cGSrtb4IhYRrtpuyvMDuAbzQs5K osrIFtTg2VoZbphnYe2nDSnDZGMhTcgynZkIFUL77wSzqOKSEeCiecZdl iIFBd6NprHGajym13fngM0jKgvMsXV9+BeyCOD25PPZnVzhDpg+HBZ97b g==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="363372952" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="363372952" 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:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="969856537" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="969856537" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga006.fm.intel.com with ESMTP; 17 Jul 2023 04:45:55 -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 11/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Mon, 17 Jul 2023 13:45:07 +0200 Message-Id: <20230717114511.484999-12-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: 1771670529640661781 X-GMAIL-MSGID: 1771670548968358011 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 Reviewed-by: Cezary Rojewski 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);