From patchwork Thu Apr 30 07:10:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lin, Mengdong" X-Patchwork-Id: 6300001 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 833319F326 for ; Thu, 30 Apr 2015 07:00:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE656201C8 for ; Thu, 30 Apr 2015 07:00:07 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1C2AF2018E for ; Thu, 30 Apr 2015 07:00:02 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E8823265A55; Thu, 30 Apr 2015 09:00:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A09692659FB; Thu, 30 Apr 2015 08:59:53 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D04D62659FF; Thu, 30 Apr 2015 08:59:51 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by alsa0.perex.cz (Postfix) with ESMTP id 79A592659EA for ; Thu, 30 Apr 2015 08:59:44 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 29 Apr 2015 23:59:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,675,1422950400"; d="scan'208";a="564121183" Received: from amanda-hsw-pc.sh.intel.com ([10.239.159.28]) by orsmga003.jf.intel.com with ESMTP; 29 Apr 2015 23:59:31 -0700 From: mengdong.lin@intel.com To: alsa-devel@alsa-project.org, tiwai@suse.de Date: Thu, 30 Apr 2015 15:10:18 +0800 Message-Id: <1430377818-21567-1-git-send-email-mengdong.lin@intel.com> X-Mailer: git-send-email 1.9.1 Cc: Mengdong Lin Subject: [alsa-devel] [PATCH] ALSA: hda - remove check on CONFIG_SND_HDA_I915 in azx_probe_continue() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mengdong Lin This is to avoid a build warning that label 'i915_power_fail' is defined but not used. There are already fake hda_i915 functions when CONFIG_SND_HDA_I915 is not defined, and error message for missing CONFIG_SND_HDA_I915 for the HD-A controller or codec that depends on i915 power well. Signed-off-by: Mengdong Lin diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5aa5cfa..87df90d 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip) if (pci->device != 0x0f04 && pci->device != 0x2284) hda->need_i915_power = 1; - -#ifdef CONFIG_SND_HDA_I915 err = hda_i915_init(hda); if (err < 0) goto i915_power_fail; @@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip) "Cannot turn on display power on i915\n"); goto i915_power_fail; } -#endif } err = azx_first_init(chip);