From patchwork Thu Aug 10 15:41:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 109819 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2560367obb; Thu, 10 Aug 2017 08:43:24 -0700 (PDT) X-Received: by 10.28.35.77 with SMTP id j74mr9512283wmj.168.1502379803996; Thu, 10 Aug 2017 08:43:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502379803; cv=none; d=google.com; s=arc-20160816; b=EbvYH1QeGzAk72iNClnDMJpk7bbl3t8/l0UqRQsC53WMQS0dj62gEiBwbuYbFCzrki YxmRwdDSk1CExlKPLfx28RYlpTVG9pU9gZx958jnCSS7I6nMVZFcD1vIBLpHOdcIDJPE XniVKBRMcx/kWl/CbzulNJPmVO/EeGoUbsoxcHND1GTcpJNvdhPnRlMbzApe40JJg0mC GWK6UYOlznrQjylbifpOm/nlIavaKDTIt16uUm5+vZRXUlRWjb1Nbd6wXwSRfWiWRjFH r2swZTaWT0lzD6v9ig+Ckob1d0khqu8h3ZNh6wOFJNK641tymvINDquMuCD8DkgBjJfL RHkg== 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=SVlLkbj7m1rVQ/FUEdgKv5ItywK0jMjNxzdZ2rGSy6Q=; b=ZzSv6IgMRL0vXxmQcXZ2UtINE20NjEPgWB9W2k+iL/yu0B1rV04ACa8Zm0wYp8zeNy jetjsyvBpN+8zFIVmyepu8phF+03p62GLVtZarVbIt6r/Qz7XfqQL89wJRfg4x2ICPHL mu7vlA4E8WBoSIAXSoBewmx9pZ2DPjwnGPkBLj/Q6F9JvHJcTLP3Vritxzq4oJ1Nmwf7 ZWS1b6IIK3+MSOgpT5LZCfNiaSyuIW4p7Pj233K2dimpvtSmpgYe2rKbGTBX0jbhFkzq b1cUh+apHvOxmt7lQ7ce6yNEANLP2qvC+UKcuXspqXlSMrBJP2ByS9BtkcA2PpDU0NTk dOfQ== 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 12si4932134wme.0.2017.08.10.08.43.23; Thu, 10 Aug 2017 08:43:23 -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 DB4952675C3; Thu, 10 Aug 2017 17:42:47 +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 425202675C3; Thu, 10 Aug 2017 17:42:46 +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, 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 E88D62675BB for ; Thu, 10 Aug 2017 17:42:28 +0200 (CEST) Received: from host86-142-17-160.range86-142.btcentralplus.com ([86.142.17.160] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dfpaz-0006ZF-MU; Thu, 10 Aug 2017 15:42:04 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dfpav-0001fF-Kv; Thu, 10 Aug 2017 16:41:57 +0100 From: Mark Brown To: Markus Elfring In-Reply-To: <181b6355-b6b6-eeae-d85b-9fb465d96b85@users.sourceforge.net> Message-Id: Date: Thu, 10 Aug 2017 16:41:57 +0100 X-SA-Exim-Connect-IP: 86.142.17.160 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: alsa-devel@alsa-project.org, Kuninori Morimoto , LKML , Takashi Iwai , kernel-janitors@vger.kernel.org, Liam Girdwood , Wolfram Sang , Mark Brown , Fengguang Wu , Marek Vasut Subject: [alsa-devel] Applied "ASoC: rsnd: Delete an error message for a failed memory allocation in three functions" 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: rsnd: Delete an error message for a failed memory allocation in three functions 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 0d7820d0918efa6c2a53acdfc47cbfc3b48df727 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Thu, 10 Aug 2017 17:13:19 +0200 Subject: [PATCH] ASoC: rsnd: Delete an error message for a failed memory allocation in three functions Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring Signed-off-by: Mark Brown --- sound/soc/sh/rcar/adg.c | 4 +--- sound/soc/sh/rcar/core.c | 4 +--- sound/soc/sh/rcar/gen.c | 4 +--- 3 files changed, 3 insertions(+), 9 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/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 5b5389e5b92b..938baff86ef2 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -586,10 +586,8 @@ int rsnd_adg_probe(struct rsnd_priv *priv) int ret; adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL); - if (!adg) { - dev_err(dev, "ADG allocate failed\n"); + if (!adg) return -ENOMEM; - } ret = rsnd_mod_init(priv, &adg->mod, &adg_ops, NULL, NULL, 0, 0); diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 2c12ad2b2b34..650cc28b0fb6 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1401,10 +1401,8 @@ static int rsnd_probe(struct platform_device *pdev) * init priv data */ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) { - dev_err(dev, "priv allocate failed\n"); + if (!priv) return -ENODEV; - } priv->pdev = pdev; priv->flags = (unsigned long)of_device_get_match_data(dev); diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index ee00e3516911..f04c4100043a 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -406,10 +406,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv) int ret; gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL); - if (!gen) { - dev_err(dev, "GEN allocate failed\n"); + if (!gen) return -ENOMEM; - } priv->gen = gen;