From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751528AbdKVUaG (ORCPT ); Wed, 22 Nov 2017 15:30:06 -0500 Received: from mout.web.de ([212.227.17.12]:50233 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260AbdKVUaF (ORCPT ); Wed, 22 Nov 2017 15:30:05 -0500 Subject: [PATCH 1/2] ASoC: cs35l34: Delete two error messages for a failed memory allocation in cs35l34_i2c_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Brian Austin , Jaroslav Kysela , Liam Girdwood , Mark Brown , Paul Handrigan , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <7e0b578a-e342-7c54-5eeb-f8dd427e59b5@users.sourceforge.net> Date: Wed, 22 Nov 2017 21:29:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:rEemMypmT2/PV7/iZ8bH4h7Hw+EDf4P5GbjxZyYxpLpiW9VFB0R jbuKRSCBxevkL0/ZQ9W3GN2MEAeVV0VkAQZak9Z6QOlIf2/Q7xf+XHKgk/ikLtRpy2tlnGE 3Xj0MbTRwxGl19s1j37od7Eyypm0NnHTCO8cRxVyVIIEy4MujACepoWEinrojJm/DTUgPBh 79xGjrv+R4xfrkdvCdLdA== X-UI-Out-Filterresults: notjunk:1;V01:K0:fSNLMAZxy1k=:qxtQ2uM33dxZ6PqAQKBmDZ spl28y5RFLeNxOM7xqzGG0D+SEQEDFuirCTzF9TJ6KPybc6z/AkxWPB5o5g9zvd8HgkD7jeq3 SP3VEWkr3KhS94ZKxl5hw+ZoKzgKdbtEB4a6Z/Mbv4V7unKnCoAUl51LK07juOMionrP53sYe W/S4CumC1S686fOpEybSPg5HtbQ2HAlA78asRr669dl8NeMFal9xTL7lkzz9FHmSXL6Hw7zlV tZfcXEYhdAgxf1fa6HVI25/catSocJpyhXRxWfvBIYhUudK2s63akSyq1huYx4vxG+y84PGrG Ma82oLHl5MhQON5uTcktje3tPcs4sLnAcT+1vBlVLCJGH9SyoOIM3YlyLfOvFv2Bau3QK/tZu jx3IaRnw8zl/foVoK4X4HtBWCI5yMMa2Qwu0yxy0lEhN48faLydXAjvtnSLzEG9WsQ/b5p/R4 LdTE8hOK737n9FRsIomKoW2NBT3M90RYzPQ8QKi/gSI3jkgjb0/QDjko5tcbdgUZ9N5mzK4ri nz6kgur0SwPE1oFCRjLssEezWlAcP5xXiWCewjj8i0n3CUa7jV1S8C8reC5TDnto+J83ekz3Z 5iFi0afMLqULhifMKAq/0dPcogR6Ms/I1hlYpFdmYtCi+br+ZOGV0u91/OKRdd5VuUacMndBj 4kTLytoMxD+hinZU6teapP8SGrLhBeCp1UauvWFDA4MQHxKAwSlbd35R32v2pQgxkQNPLXin0 A7tgGFG5sDmzKuBktFM6zT4BepzixiK6qzSv1gkk9NtD7D9tnDdOCrqdWhEPPLHXJuskR0Js0 lBDh9gWKKmKzAcU7OkvEYrRl7RsB/t8Gur4M86OgVpsnC+F34k= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 22 Nov 2017 21:13:29 +0100 Omit extra messages for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/codecs/cs35l34.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c index 1e05026bedca..6cbdbbe53940 100644 --- a/sound/soc/codecs/cs35l34.c +++ b/sound/soc/codecs/cs35l34.c @@ -1007,10 +1007,8 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, cs35l34 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l34_private), GFP_KERNEL); - if (!cs35l34) { - dev_err(&i2c_client->dev, "could not allocate codec\n"); + if (!cs35l34) return -ENOMEM; - } i2c_set_clientdata(i2c_client, cs35l34); cs35l34->regmap = devm_regmap_init_i2c(i2c_client, &cs35l34_regmap); @@ -1047,11 +1045,9 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, pdata = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l34_platform_data), GFP_KERNEL); - if (!pdata) { - dev_err(&i2c_client->dev, - "could not allocate pdata\n"); + if (!pdata) return -ENOMEM; - } + if (i2c_client->dev.of_node) { ret = cs35l34_handle_of_data(i2c_client, pdata); if (ret != 0) -- 2.15.0