From patchwork Mon Jul 7 13:18:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 4494781 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6BBA3BEEAA for ; Mon, 7 Jul 2014 13:18:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD149202FE for ; Mon, 7 Jul 2014 13:18:51 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 8CFF1201EF for ; Mon, 7 Jul 2014 13:18:50 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9CF062650CE; Mon, 7 Jul 2014 15:18:44 +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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 0E7BC26514A; Mon, 7 Jul 2014 15:18:35 +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 3C50B26516A; Mon, 7 Jul 2014 15:18:34 +0200 (CEST) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by alsa0.perex.cz (Postfix) with ESMTP id 34DCF2650CE for ; Mon, 7 Jul 2014 15:18:26 +0200 (CEST) Received: by mail-wg0-f42.google.com with SMTP id n12so2571419wgh.13 for ; Mon, 07 Jul 2014 06:18:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=u7+Bav03CN9iOYGMt/Io4nNTdG+X3KhcmSfbnUuI2/Y=; b=cK8IwW+bxeHWozz7yQSgZ/S79ruL4x9ztOde+95oIB7rAQE6ncfpbpbDxZeMRQf4Kq UdmYvElrarrXIy05dfORM4+yUcoYudGC1h/45CcLOZkxAImmQ5nfZxuyIIf/jHeSPLJS osBHKp/IghEcXJo3NR/FeISh9LQzyJyXYmf0E5wA5YWcWZgguWKm4K2/NpTPC8fco5fE l6pAoCL7MF87ZiHxBjp6HLR6UQZN9KmnbWOc6gLZUF4yRWicIY+BSGbVcTACLIqgfRSl pKA0Ct8TVsD20QmcroVj1vPLxvHVSszPe0zvWK1kqSFBNAyxyVxhpqOG/zGtxB64CgCa bmEQ== X-Received: by 10.194.24.36 with SMTP id r4mr32524503wjf.35.1404739105931; Mon, 07 Jul 2014 06:18:25 -0700 (PDT) Received: from localhost (port-12246.pppoe.wtnet.de. [84.46.48.6]) by mx.google.com with ESMTPSA id q11sm115143753wib.14.2014.07.07.06.18.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jul 2014 06:18:25 -0700 (PDT) From: Thierry Reding To: Mark Brown , Liam Girdwood Date: Mon, 7 Jul 2014 15:18:19 +0200 Message-Id: <1404739099-20717-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.0.1 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH] ASoC: max98090: Fix build warning 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: Thierry Reding The max98090_{suspend,resume}() functions are used for system sleep and therefore need to be guarded by CONFIG_PM_SLEEP rather than CONFIG_PM. Signed-off-by: Thierry Reding --- sound/soc/codecs/max98090.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index ca74f502a4cb..e806065d68cc 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2415,7 +2415,7 @@ static int max98090_runtime_suspend(struct device *dev) } #endif -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int max98090_resume(struct device *dev) { struct max98090_priv *max98090 = dev_get_drvdata(dev);