From patchwork Wed Jul 26 14:17:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 108770 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp880525obm; Wed, 26 Jul 2017 07:20:06 -0700 (PDT) X-Received: by 10.223.183.15 with SMTP id l15mr1214852wre.260.1501078806143; Wed, 26 Jul 2017 07:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501078806; cv=none; d=google.com; s=arc-20160816; b=uzu7aR2K9f3aXjK7o89jlzQBHdazZhGNjhFXEVqY2ZbW3yXUR+pvwtR6TY1ytbNHO3 iivGdcy1appU1dKY28t3NIbRRODAIP7y3zWdouP+MRFKxwiPFZViPz77nRq3iiFQQK+A Puv6q4CA7JvGuQLsrC5ezwSsnIpszlOOaM3yihzEpRdaO/+VKE9BPZ6CB/JZTBETpIbf wL6cSPe6RC6bQxK+eo7Kue4azeKxPOOVTz9iQJqT8lSLNbUOAJMvh6F0g/4I4FQwk9Hd 0sK6VFIzyK5bcImqvoH2vsbfy02TaNlhROe1YxrjE4UBZzq8yxmCmenfyA7IDoTEpxlM akCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :delivered-to:arc-authentication-results; bh=+ikajPf9+CeliRSKbsFT61Iorzk+0eXIuc3MoGt4UMg=; b=mxXtfODj76+pZi/AGDCQ/P8sUOVjU9tznUlqE6jhnj4ELDjajehES6SAHVkTVYHhAT qEW5I+Rmaku5xGGcYVKzAFv9zJFdOcTJRXmaz9nocO6wt6ifvD8z42612QO/+2/q/TZb Ysf7Mgxofd15PFYNjZunvZFIuMpv5yfrpPRaYEsM4RMt8OBbxOxPobHPWzeCswgUbgIP AHFVStKgsh/BG+Mp8+2t2HAEnOWaKrDIcEbdnV+7S92/nWHGeR73VAq686hC9iN56Hvu mQLtJSYtcPnlB33Rpjbs/sidvNG0rIosDKc4ijxvpKns08+DIQJBDtMT20hojO/ouZ7m Th8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id e70si72666wme.194.2017.07.26.07.20.05; Wed, 26 Jul 2017 07:20:06 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3D1F3267532; Wed, 26 Jul 2017 16:18:03 +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 49EC5267531; Wed, 26 Jul 2017 16:18:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 99AFA267465 for ; Wed, 26 Jul 2017 16:17:30 +0200 (CEST) Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1daN7r-0000ed-Rt; Wed, 26 Jul 2017 14:17:26 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1daN7p-0003cr-98; Wed, 26 Jul 2017 15:17:21 +0100 From: Mark Brown To: oder_chiou@realtek.com In-Reply-To: <1501065140-14843-1-git-send-email-oder_chiou@realtek.com> Message-Id: Date: Wed, 26 Jul 2017 15:17:21 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: Oder Chiou , jack.yu@realtek.com, alsa-devel@alsa-project.org, hychao@google.com, lgirdwood@gmail.com, broonie@kernel.org, shumingf@realtek.com, bardliao@realtek.com, flove@realtek.com Subject: [alsa-devel] Applied "ASoC: rt5514: Use the IS_ENABLED to supports the module build" to the asoc tree 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 The patch ASoC: rt5514: Use the IS_ENABLED to supports the module build has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c2bf252536577db77c719f62a54cad2e4be5c4d7 Mon Sep 17 00:00:00 2001 From: "oder_chiou@realtek.com" Date: Wed, 26 Jul 2017 18:32:20 +0800 Subject: [PATCH] ASoC: rt5514: Use the IS_ENABLED to supports the module build The patch uses the macro IS_ENABLED to make sure that the SPI function also supports the module build. Signed-off-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5514.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 3d0aea8f3801..21cbb566c0d3 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -31,7 +31,7 @@ #include "rl6231.h" #include "rt5514.h" -#if defined(CONFIG_SND_SOC_RT5514_SPI) +#if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI) #include "rt5514-spi.h" #endif @@ -312,7 +312,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol, request_firmware(&fw, RT5514_FIRMWARE1, codec->dev); if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI) +#if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI) rt5514_spi_burst_write(0x4ff60000, fw->data, ((fw->size/8)+1)*8); #else @@ -325,7 +325,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol, request_firmware(&fw, RT5514_FIRMWARE2, codec->dev); if (fw) { -#if defined(CONFIG_SND_SOC_RT5514_SPI) +#if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI) rt5514_spi_burst_write(0x4ffc0000, fw->data, ((fw->size/8)+1)*8); #else