From patchwork Fri Mar 14 08:26:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 3831261 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 6354FBF540 for ; Fri, 14 Mar 2014 08:25:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EEBC20306 for ; Fri, 14 Mar 2014 08:25:50 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5EF6C202E9 for ; Fri, 14 Mar 2014 08:25:49 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 66634265164; Fri, 14 Mar 2014 09:25:47 +0100 (CET) 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,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 2B59D264FF9; Fri, 14 Mar 2014 09:25:42 +0100 (CET) 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 5F38826509D; Fri, 14 Mar 2014 09:25:40 +0100 (CET) Received: from smtp-out-088.synserver.de (smtp-out-118.synserver.de [212.40.185.118]) by alsa0.perex.cz (Postfix) with ESMTP id 6771A264FF9 for ; Fri, 14 Mar 2014 09:25:33 +0100 (CET) Received: (qmail 29893 invoked by uid 0); 14 Mar 2014 08:25:32 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 29701 Received: from ppp-46-244-130-51.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [46.244.130.51] by 217.119.54.81 with SMTP; 14 Mar 2014 08:25:32 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Fri, 14 Mar 2014 09:26:11 +0100 Message-Id: <1394785572-28315-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 Cc: Rongjun Ying , Barry Song , Lars-Peter Clausen , alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH 1/2] ASoC: sirf-audio-codec: Remove snd_soc_codec_set_cache_io() call 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 There was a overlap between the snd_soc_codec_set_cache_io() cleanup and the addition of the sirf-audio-codec resulting in the sirf-audio-codec driver still using the old signature of snd_soc_codec_set_cache_io(), which will cause a compile error. Since the core is able to automatically setup IO for this driver we can just remove both the snd_soc_set_cache_io() call and the control_data assignment. Signed-off-by: Lars-Peter Clausen --- sound/soc/codecs/sirf-audio-codec.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index 90e3a22..58e7c1f 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -337,18 +337,9 @@ struct snd_soc_dai_driver sirf_audio_codec_dai = { static int sirf_audio_codec_probe(struct snd_soc_codec *codec) { - int ret; struct snd_soc_dapm_context *dapm = &codec->dapm; - struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec); pm_runtime_enable(codec->dev); - codec->control_data = sirf_audio_codec->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } if (of_device_is_compatible(codec->dev->of_node, "sirf,prima2-audio-codec")) { snd_soc_dapm_new_controls(dapm,