From patchwork Fri Jul 14 20:24:53 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: 120461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2475333vqm; Fri, 14 Jul 2023 05:41:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlGGFPm6eoNh8B+j4uEU7brVUcQIfXFrxLr0hY2qgmcnAkELGvjlytrlSUOxWrqNqV9fBbvF X-Received: by 2002:a05:6a20:1056:b0:133:bbe0:2ff2 with SMTP id gt22-20020a056a20105600b00133bbe02ff2mr991588pzc.19.1689338491373; Fri, 14 Jul 2023 05:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689338491; cv=none; d=google.com; s=arc-20160816; b=Q/CIoGSvmNbqkMErFYvYl2iRiDzwGIYV6KU37Spaic+LykB/9xXFVGY9Ld+6Mo4zKI IsyrY8Yb6SZcLB2I05SXEM0+wifjPmniACBhT7X9EB6ylFHBHJb9s9WI5KKo5iIisprL OmE9R3gNehGESpXGmGf+wXSY9UUa3IGPhupHiYFYPSj6Hm0lW2tJdlHJ0aPJK3DPZaid QcddPuQbd4riLPV4Iu23RPnCTPI8PFNXmjfnfO+LrRxsXDHEea9UJhiNnF/IWD5Mi6tE ysa0j0rqWgFHpTXcZGbqeqJpIXc3tXBAktXTjQME+ussBgOucRShECITnaeU8ACSOPl7 HAFw== 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=bc9lgwEI7cfI8Efi4nnow1TDoD4XLX0YYw4Nick8koxCVNSunf3g35JxatxUscxwbE ujBoOehGJhrW+tRe9Xi6expd9UPLVsHcOwi05OVV+2YhMXe0wH/lhgktX1EmFqGYW1EW SppghqYuSnxCOIHF8dDIfssec6ObmluGhlMjrleruHIUpUykZbAxjRg8RT0i3bjvpHRx 5dRmMOoJMHQfyQMGMFkLP63aP0AI0Q2rkFqDhA0SkCbG0qShGNF47/SqTuMLUg8JZc5k 8P4wZYe5wxvM/1IEtwFS2Ivo1eSDCiDeICWYq2Cbj876S/sjuzeryeWhWMV3GOMvgR/B ggjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JePdifSR; 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 l189-20020a6388c6000000b0054fd88c3598si6859942pgd.35.2023.07.14.05.41.18; Fri, 14 Jul 2023 05:41:31 -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=JePdifSR; 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 S235642AbjGNMZX (ORCPT + 99 others); Fri, 14 Jul 2023 08:25:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235908AbjGNMY4 (ORCPT ); Fri, 14 Jul 2023 08:24:56 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D98F35BB; Fri, 14 Jul 2023 05:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689337463; x=1720873463; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6Hi0/au1Z7W8Ae3bYV68XGhs74D1joYSt9bHUr1c1ng=; b=JePdifSRN6aX/lGoOVNEx3H8WyCxqx15l0LeaSKcOQeH4ahUnYOSTYtM v5uK05/ZSFzBxT8B1s3dkIaQT0HC56d/7IBxcauOjCh1FLkN/qCjNRfa4 0MmDlgJ5+INQ/Pdp7roAYKqQpNUoCXCvNhLR8CX9mRiLHHJSfrMs5qrYf i4GwPnPReMr5fNMgoKDE2f90r9uUJoKvGSAQNSY4DZ2xNlTnJCbQHxSgv q4FVQtbveq35nKNfuaqN7m34+kHResrEktzvLnR9Ukcpa3zTiqDk7DTT1 ZrXspmdHKKp/9eHonnM/WXiQvkrk1h5O1WQ3EQlnMQq5TPExyPIHbmrvi w==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="429225883" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="429225883" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 05:24:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="1053034977" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="1053034977" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga005.fm.intel.com with ESMTP; 14 Jul 2023 05:24:11 -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 v3 11/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Fri, 14 Jul 2023 22:24:53 +0200 Message-Id: <20230714202457.423866-12-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> References: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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: 1771399796981905387 X-GMAIL-MSGID: 1771399797438881550 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);