From patchwork Fri Jun 20 09:59:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 4387771 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 66E39BEEAA for ; Fri, 20 Jun 2014 10:10:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B95C203AF for ; Fri, 20 Jun 2014 10:10:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 42C8F20351 for ; Fri, 20 Jun 2014 10:10:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id CD552265347; Fri, 20 Jun 2014 12:10:31 +0200 (CEST) Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 005C9265011; Fri, 20 Jun 2014 12:05:25 +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 16E6E265041; Fri, 20 Jun 2014 12:05:23 +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_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by alsa0.perex.cz (Postfix) with ESMTP id 5E8EF265011 for ; Fri, 20 Jun 2014 12:02:50 +0200 (CEST) Received: by mail-pd0-f173.google.com with SMTP id r10so2819508pdi.4 for ; Fri, 20 Jun 2014 03:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uWUVf3tl2UQPgXq7r2msgVrbkgFwgHY25bla3JsU7e4=; b=dA2vaOT78fnht6cKKO49KPl7azas9ViWNhq7/5tJUmFAhLjggJMfQgWA8Aq6DPTYyO 900ofFDMaE6iGYsDczq5ufsat/lTysrBWkX0z7/Vlkh9AxTrHCTjAhzyvheTzx5y1Hm5 fBFiBEiSn/A0jBQc1/QkOPOTTSt5Ft3qJM24v+FAnCMcsjE/80Ca7kNs5Vwz3Vf1oemB JUXsOgb7SYqPcemNdc7ODPKqw+Wk8S/AZuw8aVMyHSlBP0eSGeGpwq0i3Tjc25dioPGY ofpU+SPglVHRZzt4fyLCcdTtY14PIxXSgkg4mtM+HyP2IBWLBjdWaAuXVbRxOlKJU98f mi8g== X-Received: by 10.68.196.137 with SMTP id im9mr3189813pbc.105.1403258569547; Fri, 20 Jun 2014 03:02:49 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id ha10sm12718305pbd.1.2014.06.20.03.02.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 03:02:48 -0700 (PDT) From: Sachin Kamat To: alsa-devel@alsa-project.org Date: Fri, 20 Jun 2014 15:29:05 +0530 Message-Id: <1403258352-8210-9-git-send-email-sachin.kamat@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403258352-8210-1-git-send-email-sachin.kamat@samsung.com> References: <1403258352-8210-1-git-send-email-sachin.kamat@samsung.com> Cc: broonie@kernel.org, spk.linux@gmail.com, lgirdwood@gmail.com Subject: [alsa-devel] [PATCH 09/16] ASoC: wm0010: Remove redundant OOM message 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 Let memory subsystem handle the error logging. Signed-off-by: Sachin Kamat Acked-by: Charles Keepax --- sound/soc/codecs/wm0010.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 71ce3159a62e..982467c1d56a 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -413,7 +413,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); if (!xfer) { - dev_err(codec->dev, "Failed to allocate xfer\n"); ret = -ENOMEM; goto abort; } @@ -423,8 +422,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) out = kzalloc(len, GFP_KERNEL | GFP_DMA); if (!out) { - dev_err(codec->dev, - "Failed to allocate RX buffer\n"); ret = -ENOMEM; goto abort1; } @@ -432,8 +429,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) img = kzalloc(len, GFP_KERNEL | GFP_DMA); if (!img) { - dev_err(codec->dev, - "Failed to allocate image buffer\n"); ret = -ENOMEM; goto abort1; } @@ -526,14 +521,12 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) /* Copy to local buffer first as vmalloc causes problems for dma */ img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); if (!img) { - dev_err(codec->dev, "Failed to allocate image buffer\n"); ret = -ENOMEM; goto abort2; } out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); if (!out) { - dev_err(codec->dev, "Failed to allocate output buffer\n"); ret = -ENOMEM; goto abort1; } @@ -679,11 +672,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) } img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA); - if (!img_swap) { - dev_err(codec->dev, - "Failed to allocate image buffer\n"); + if (!img_swap) goto abort; - } /* We need to re-order for 0010 */ byte_swap_64((u64 *)&pll_rec, img_swap, len);