From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ED4CC43603 for ; Wed, 18 Dec 2019 16:29:26 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADF9724676 for ; Wed, 18 Dec 2019 16:29:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="nxekWXiy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADF9724676 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E5C75839; Wed, 18 Dec 2019 17:28:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E5C75839 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1576686564; bh=8WxhUXCm8Hw98+BXcd9NP23LR7cUKassvhJ/ix7cAfI=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=nxekWXiyyXDUdP/sKS5UE6xBXwm6ChePPW2EDilaTSEF+YjBmw+YDvendv3p5cBf4 BcY8jwlQt/e+xpzZfZ6g7Vkjwr2n4GFNicvGUDBrUIP9l+Vl+Y1i8mcHFD62UFAfq1 ux5Yko5nbH3rkfD2SyaGeETAGAFTmh+TPaHV5j4k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 80BE4F8014C; Wed, 18 Dec 2019 17:28:33 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 99F1BF8022C; Wed, 18 Dec 2019 17:28:32 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0C73BF80059 for ; Wed, 18 Dec 2019 17:28:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0C73BF80059 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id ABCB4B18B; Wed, 18 Dec 2019 16:28:28 +0000 (UTC) Date: Wed, 18 Dec 2019 17:28:28 +0100 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart In-Reply-To: References: <20191126141423.21523-1-pierre-louis.bossart@linux.intel.com> <0131b134-46dc-991f-230b-fe843f43f078@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: alsa-devel@alsa-project.org, broonie@kernel.org Subject: Re: [alsa-devel] [PATCH] ASoC: SOF: Intel: add PCI ID for CometLake-S X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Wed, 18 Dec 2019 16:21:22 +0100, Pierre-Louis Bossart wrote: > > >>> Also, can we reduce even the ifdef around sof_dev_desc definitions by > >>> __maybe_unused atttribute? > >> > >> Sorry, I am not following your suggestion. I would really like to keep > >> the ifdefs for now, and while it can be seen as overkill to have > >> descriptors that are identical in some cases the past experience shows > >> it's useful when we have to add quirks for specific 'hardware > >> recommended programming sequences'. > > > > What I suggested was simple, just dropping ifdef by something like > > > > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > > index bbeffd932de7..297632a54f1b 100644 > > --- a/sound/soc/sof/sof-pci-dev.c > > +++ b/sound/soc/sof/sof-pci-dev.c > > @@ -36,8 +36,7 @@ MODULE_PARM_DESC(sof_pci_debug, "SOF PCI debug options (0x0 all off)"); > > #define SOF_PCI_DISABLE_PM_RUNTIME BIT(0) > > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) > > -static const struct sof_dev_desc bxt_desc = { > > +static const struct sof_dev_desc __maybe_unused bxt_desc = { > > .machines = snd_soc_acpi_intel_bxt_machines, > > .resindex_lpe_base = 0, > > .resindex_pcicfg_base = -1, > > @@ -52,10 +51,8 @@ static const struct sof_dev_desc bxt_desc = { > > .ops = &sof_apl_ops, > > .arch_ops = &sof_xtensa_arch_ops > > }; > > -#endif > > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE) > > -static const struct sof_dev_desc glk_desc = { > > +static const struct sof_dev_desc __maybe_unused glk_desc = { > > .machines = snd_soc_acpi_intel_glk_machines, > > .resindex_lpe_base = 0, > > .resindex_pcicfg_base = -1, > > @@ -70,10 +67,8 @@ static const struct sof_dev_desc glk_desc = { > > .ops = &sof_apl_ops, > > .arch_ops = &sof_xtensa_arch_ops > > }; > > -#endif > > ..... > > > > > > Then the issue I pointed above can be solved as well. > > The ifdefs are still needed in the PCI IDs tables Yes, but it halves the messes :) Takashi > > static const struct pci_device_id sof_pci_ids[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_MERRIFIELD) > { PCI_DEVICE(0x8086, 0x119a), > .driver_data = (unsigned long)&tng_desc}, > #endif > #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) > /* BXT-P & Apollolake */ > { PCI_DEVICE(0x8086, 0x5a98), > .driver_data = (unsigned long)&bxt_desc}, > { PCI_DEVICE(0x8086, 0x1a98), > .driver_data = (unsigned long)&bxt_desc}, > #endif > #if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE) > { PCI_DEVICE(0x8086, 0x3198), > .driver_data = (unsigned long)&glk_desc}, > #endif > > so for consistency I personally prefer the matching ifdef for the > descriptors. > > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel