From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751606AbdKVT5t (ORCPT ); Wed, 22 Nov 2017 14:57:49 -0500 Received: from mout.web.de ([212.227.17.12]:57786 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751286AbdKVT5r (ORCPT ); Wed, 22 Nov 2017 14:57:47 -0500 Subject: [PATCH 1/2] ASoC: cs35l32: Delete two error messages for a failed memory allocation in cs35l32_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: <8980f9c6-f559-816f-9ec8-e22194e0f3aa@users.sourceforge.net> Date: Wed, 22 Nov 2017 20:56:57 +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:cEDDD7Xxbd9pS96pTSJzQEdBORR+GVSmsUMMlJVpUolGmEKCuI1 bR13/FZ22LOqLjVuRoPmhuZHcxQ5HcFGuSxZ6hFvwVL3S+IjNdalwdIYQ55y5KeaVHJL93a Fyu8Ylfn7ZcJFIhMKeUJv28+MxZh9NYbd40bYTpWn0CLUk9blRV7jxyB3Rpd+eii5KgILe5 LHbI56Tc61ngRzz6zVh7A== X-UI-Out-Filterresults: notjunk:1;V01:K0:v7a8yiGG7rw=:t46xmySfI762EeLh7OzkE8 l8VivgbgCRmRxBVLDF0kc2r3D54vwDWE/Q3E8aRCIet6PqPT93lnsVLa1UMx0BouSsjboWba7 RpL5p6ubLX8DTSyYw0tvvqu8dC/iI4T9fzvYknOEv6rkEdWaVPRjdamDLAVFiKuxuxRjyadwm 39jUlInij4zz5kX0Lkb/o7rDaAFR87xMjDj26O7aW41+5zox3Ihcop76OhE69p0NHVGL4RGtD XDY1s46oh8wCWi7BPj9nd4Tlv6mJDfkUwr5+CCQYI9TUyGcpXzw3YgPN029vBKG4VIHxKuSUr ORJ8QLm8TP+Wq8O/1zdfNQwc/sbMVuYad0xKcDFHkXgyo9lyPa9xdl+sTsUxpBEgbGDIghuOe n6WlwOoG9qFw+vEJC4wQWE2jhqKKFWhTgxJex7OsrzEHMDUyRrQOYAsPLlxGw5CCmdr57MR/B /hB0VkDn6EZHQIImczcbsbcQbCy1+AJdc+9qYr6KB+3Mff4SLtKe0f+76+vhoLisNxTg5cs95 uWqkuu8keaxPLuAma8Oafk16emUq/K76HTj1Oi4k5malTMSit9eeL2kQgZym9DuLNNgPCdRbs sYedKl7qB/Rky9Be8UQQtsQoPkviKbg4O9aDRBVg6Wa6bPGza7RwnCCCBC9QZiybCf/+j5DX3 LGks7DHY28CzaQ9iz6hbEXJv9vIpoUwmZtEItqP/OOoClQeK4l2zHA7tJ5gIpzsldjIFByOcv BTdl2W/aKIFQF1EQU+nBZQ53dqLeTZL55Zuj76uZQ7X5Uqr/tauBhXVxBPjrKHftNcC7x3I1x LOUN/HHnxJmUCyl9e9UL3GDSDG4cILkURfEDsBxuRkf+8OxqTY= 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 20:35:06 +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/cs35l32.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index 7e9806206648..e41d8ebe6eea 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -358,10 +358,8 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client, cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l32_private), GFP_KERNEL); - if (!cs35l32) { - dev_err(&i2c_client->dev, "could not allocate codec\n"); + if (!cs35l32) return -ENOMEM; - } i2c_set_clientdata(i2c_client, cs35l32); @@ -378,10 +376,9 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client, pdata = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l32_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 = cs35l32_handle_of_data(i2c_client, &cs35l32->pdata); -- 2.15.0