From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752737AbaE0FhZ (ORCPT ); Tue, 27 May 2014 01:37:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53096 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751466AbaE0FhY (ORCPT ); Tue, 27 May 2014 01:37:24 -0400 Date: Tue, 27 May 2014 07:37:12 +0200 Message-ID: From: Takashi Iwai To: Arnd Bergmann Cc: Stephen Warren , Dylan Reid , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] ALSA: hda: fix tegra build In-Reply-To: <4369871.VRtaiA22pI@wuerfel> References: <4369871.VRtaiA22pI@wuerfel> 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/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 26 May 2014 21:15:20 +0200, Arnd Bergmann wrote: > > When CONFIG_PM is disabled, the CONFIG_SND_HDA_POWER_SAVE_DEFAULT symbol > does not get defined, which causes a build error for the hda-tegra driver: > > hda/hda_tegra.c:80:25: error: 'CONFIG_SND_HDA_POWER_SAVE_DEFAULT' undeclared here (not in a function) > static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; > ^ > /git/arm-soc/sound/pci/hda/hda_tegra.c:235:13: warning: 'hda_tegra_disable_clocks' defined but not used [-Wunused-function] > static void hda_tegra_disable_clocks(struct hda_tegra *data) > ^ > > This works around the problem by not referencing that macro > when CONFIG_PM is disabled. Instead, we assume that it's disabled > unconditionally and cannot be enabled at runtime. > > Signed-off-by: Arnd Bergmann > Cc: Dylan Reid > Cc: Stephen Warren > Cc: Takashi Iwai > --- > Same patch, but this time with correct Signed-off-by line. Thanks, applied now. Takashi > > diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c > index 086fd06..a366ba9 100644 > --- a/sound/pci/hda/hda_tegra.c > +++ b/sound/pci/hda/hda_tegra.c > @@ -77,10 +77,14 @@ struct hda_tegra { > void __iomem *regs; > }; > > +#ifdef CONFIG_PM > static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; > module_param(power_save, bint, 0644); > MODULE_PARM_DESC(power_save, > "Automatic power-saving timeout (in seconds, 0 = disable)."); > +#else > +static int power_save = 0; > +#endif > > /* > * DMA page allocation ops. >