From nobody Mon Feb 9 11:47:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B03EEB64DA for ; Fri, 14 Jul 2023 10:56:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236262AbjGNK4V (ORCPT ); Fri, 14 Jul 2023 06:56:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236303AbjGNKzp (ORCPT ); Fri, 14 Jul 2023 06:55:45 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC7D835B5; Fri, 14 Jul 2023 03:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689332139; x=1720868139; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gt1bM8Q/FD2VIOVF2wWpS3Dslq5MDz04LTOzsoLpYFY=; b=liq+fI10gHXRnSzhvEU6uYGSez5ZanjRb5VUP+QS+gzEdXVqnaHW6Wgb VdCHCWYiFfDRoefoDTQ4fLSrl4V91RL96pQyE4N2bM87hAerjcgE3SwQX GU0DeM2ounT8ltd1biFiQK9AL0ZiHpl/IsOD5YaReYIeQkdyckiWjrwvm nyUGBBPlWYLw+7X6d14yGjAyXk3YreBDhtI8Ivatjt0OWml/xFidy09CB K+Ojs/CwnV9QL6mCLv2gR3FvtKsMtKbyv3y+xkkbBElSIAos1qqWqWQBG KjcLUxmr95xcVsxM0MbYhL+LoAFUqUs4LdCZkTvbUwYV8h5z20e0rhO2Q w==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="364321237" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="364321237" 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:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="722365600" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="722365600" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2023 03:55:36 -0700 From: =?UTF-8?q?Amadeusz=20S=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=20S=C5=82awi=C5=84ski?= , Andy Shevchenko Subject: [PATCH v2 12/15] ASoC: Intel: avs: Convert to PCI device IDs defines Date: Fri, 14 Jul 2023 20:56:12 +0200 Message-Id: <20230714185615.370597-13-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro, so device ID can be provided in short form. Acked-by: Mark Brown Reviewed-by: Andy Shevchenko Signed-off-by: Amadeusz S=C5=82awi=C5=84ski --- sound/soc/intel/avs/board_selection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/bo= ard_selection.c index 60f8fb0bff95..b32e02940e30 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -263,14 +263,14 @@ struct avs_acpi_boards { }; =20 #define AVS_MACH_ENTRY(_id, _mach) \ - { .id =3D (_id), .machs =3D (_mach), } + { .id =3D PCI_DEVICE_ID_INTEL_##_id, .machs =3D (_mach), } =20 /* supported I2S boards per platform */ static const struct avs_acpi_boards i2s_boards[] =3D { - AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */ - AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */ - AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */ - AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */ + AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines), + AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines), + AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines), + AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines), {}, }; =20 --=20 2.34.1