From patchwork Tue Jul 11 12:57:19 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: 118516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp468729vqm; Tue, 11 Jul 2023 06:13:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFXXJQWFn1Gx0sVHr3ToC7iz6/NFmMcjInQak0sRtyFMGyrE3nCyPKlRMmc7UPtgh6blUmA X-Received: by 2002:a17:906:20d8:b0:994:13c3:2f89 with SMTP id c24-20020a17090620d800b0099413c32f89mr4095152ejc.27.1689081226673; Tue, 11 Jul 2023 06:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689081226; cv=none; d=google.com; s=arc-20160816; b=sAUvhb5vjMdxpkNUJ++nQ5SD/YgtRh10S/WU4xWvTNhpLQpGF+8vS0X2IEN7QqJJOh T4oOTAyZwRKJlhkTU3er0jcESP8FCUQTjDb+s3z00jP9aqbWwmkq1PuyYSU8jkKSq+O5 h1odnMI+rVatHRDowtKH5+1ugU5+MbIc1GQIJPJeSF86pRUh/ISe9opLHMxvljnvFVKD RXPSlMfzgCOcAVT+U0sYAplp5BnhP4TER/uc8mnQFaxSQ8FYfWwc7YfBnN36DBGlYmGD JRf5UnAtEjfkFvg5BXvXE/5UmgzoMRhyHkS08VMixr6JsmarsQwxabp7LF9Dx1V/jgl1 aKtA== 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=VGdd4BYHPYCKdRE15oq91uKxCPA8KQajrsGVKhYwS7s=; fh=sKxO7Xj+YIOQJw2gBVYevujm0+5GA4/lF0Hs7SAhyQ0=; b=RCTDoL+ZfGpOFAjENqTqnohYtZd82OLZTcFjXQl+r8nmElX2Uyrvo/pOQTzqH7SZ+a Cy2ZlluyXhid9n/kHwpz11gbdSqu/SZfjrk/Fup5xZ81illdXv2FJPZUJDpU86y++UoT wNqHLEqJmGvRd1/urA3Vqoxas40HEn5doPGqGU2iEEd1407F//PYKGpKnIbkzmMwctQ4 fGGubmq9wG7OYwDcmRyFravRmj9pZLiCP7+F5tzlH2M7a0qW0CI1Q9InfGkl+7HqhY5F nXXDgMnRwfQccdc2leEEi0+w82ffevNos3Qsua92K6X5r0GymRP7m/RTPT3OZWOMABh6 qXMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WLFhVL98; 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 gv20-20020a170906f11400b00988786fec30si1856291ejb.935.2023.07.11.06.13.22; Tue, 11 Jul 2023 06:13:46 -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=WLFhVL98; 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 S232085AbjGKM65 (ORCPT + 99 others); Tue, 11 Jul 2023 08:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbjGKM6t (ORCPT ); Tue, 11 Jul 2023 08:58:49 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98701E6C; Tue, 11 Jul 2023 05:58: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=1689080303; x=1720616303; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zk2sNO05UAbs2nuTw7unuMIHhKz7EsY9TKiKaOgRRPU=; b=WLFhVL98iVycMmc8vTrz98MEz2d184rGUpccF+8Z1nbTGC3P/IYgniDX Qduw5PtX/ZTqIlPdQw9T1MN7xXDdHumdjsaACULPMhL59m05EVq6hmZ03 T9D5zRl6i3uM/+dywuxlL83gmY4KrRZpHcyNBW1h50BTBYBIXmG5m3fba ghRmyt2khPn0phZv/+vDU+g7TccSBGDMrjklBzpmmkv5G4J00V2QAXqmz +e2tEOlIUU8NcOc6nELAOtfYP2IF1XEJS6eRhMXhE2BuGk3En1iJMmflW z7j5AXs5EgCN1WyrhJ6mE8pai0b+eGxYkSzJtcO8tS6F8u/3HT+pd+9M5 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="367187444" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="367187444" 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:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10768"; a="834666632" X-IronPort-AV: E=Sophos;i="6.01,196,1684825200"; d="scan'208";a="834666632" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga002.fm.intel.com with ESMTP; 11 Jul 2023 05:57:21 -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 06/13] ASoC: Intel: Skylake: Use global PCI match macro Date: Tue, 11 Jul 2023 14:57:19 +0200 Message-Id: <20230711125726.3509391-7-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: 1771130036168551050 X-GMAIL-MSGID: 1771130036168551050 Instead of using local macro to match PCI device, use global one. Acked-by: Mark Brown Signed-off-by: Amadeusz Sławiński Reviewed-by: Andy Shevchenko --- include/sound/hda_codec.h | 3 --- sound/soc/intel/skylake/skl-pcm.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index bbb7805e85d8..5497dc9c396a 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -18,9 +18,6 @@ #include #include -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) -#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) - /* * Structures */ diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index a4209d88b0c6..ac3dc8c63c26 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include "skl.h" @@ -152,7 +153,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params) * The recommended SDxFMT programming sequence for BXT * platforms is to couple the stream before writing the format */ - if (IS_BXT(skl->pci)) { + if (HDA_CONTROLLER_IS_APL(skl->pci)) { snd_hdac_ext_stream_decouple(bus, stream, false); err = snd_hdac_stream_setup(hdac_stream(stream)); snd_hdac_ext_stream_decouple(bus, stream, true);