Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756260AbbFQNNn (ORCPT ); Wed, 17 Jun 2015 09:13:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38744 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754694AbbFQNNk (ORCPT ); Wed, 17 Jun 2015 09:13:40 -0400 Date: Wed, 17 Jun 2015 15:13:39 +0200 Message-ID: From: Takashi Iwai To: Frans Klaver Cc: Jaroslav Kysela , Subject: Re: [PATCH] sound: hda_intel: fix warning if SND_HDA_I915=n In-Reply-To: <1434545599-17662-1-git-send-email-frans.klaver@xsens.com> References: <1434545599-17662-1-git-send-email-frans.klaver@xsens.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/24.5 (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=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1683 Lines: 54 At Wed, 17 Jun 2015 14:53:19 +0200, Frans Klaver wrote: > > When building with CONFIG_SND_HDA_I915=n, I get the following warning: > > sound/pci/hda/hda_intel.c: In function ‘azx_probe_continue’: > sound/pci/hda/hda_intel.c:1882:2: warning: label ‘skip_i915’ defined but not used [-Wunused-label] > skip_i915: > ^ > > Fix this by using 'if (IS_ENABLED())' rather than #ifdef. > > Signed-off-by: Frans Klaver This was already fixed in the latest tree. Thanks. Takashi > --- > sound/pci/hda/hda_intel.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index a244ba706317..d85a53ceab6d 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1856,8 +1856,8 @@ static int azx_probe_continue(struct azx *chip) > int err; > > /* Request power well for Haswell HDA controller and codec */ > - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { > -#ifdef CONFIG_SND_HDA_I915 > + if (IS_ENABLED(CONFIG_SND_HDA_I915) && > + chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { > err = hda_i915_init(hda); > if (err < 0) { > /* if the controller is bound only with HDMI/DP > @@ -1876,7 +1876,6 @@ static int azx_probe_continue(struct azx *chip) > "Cannot turn on display power on i915\n"); > goto out_free; > } > -#endif > } > > skip_i915: > -- > 2.3.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/