From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754992AbdESLfH (ORCPT ); Fri, 19 May 2017 07:35:07 -0400 Received: from mout.web.de ([212.227.15.4]:53737 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750793AbdESLfF (ORCPT ); Fri, 19 May 2017 07:35:05 -0400 Subject: [PATCH v2] mmc: core: Delete an error message for a failed memory allocation in four functions To: Ulf Hansson Cc: "linux-mmc@vger.kernel.org" , Bojan Prtvar , Linus Walleij , Paul Burton , Shawn Lin , Tomas Winkler , Uri Yanai , Wolfram Sang , LKML , kernel-janitors@vger.kernel.org References: <50f3c642-b866-27f3-1201-5490225116f4@users.sourceforge.net> From: SF Markus Elfring Message-ID: <0ce8f8ac-d340-3f15-a698-ddfa449508e1@users.sourceforge.net> Date: Fri, 19 May 2017 13:34:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:rhXc54SxMvQAFNKSHIJEWEtuxbSKWpwW2mKKocHKPloP/yVv2iA hOG1Un90JsC94SyZXn3heV8u0YeKVvzgkrh8PbKarCEm6JUcqmNLKnY5rPeT8BUu2ezTGlk Z0ykHhwSW94hPCNLqMy6xc97p8GjBTHQMnji8Xd97GGbAgUvgPLx44XgP6Mz0Egj+7aH/lz 3R3LiGKNFIUzDbPiApedQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WgAypAczSZA=:afLRgmwuvC0xq/a+LEmodM gg42ebDeLgUE1RaGqNsKVn+w4S1LB9SZLgNvHyALuwVPBXwceqU5tsxTN8bWUeqZ1V43iJQxx dJqRvKb4Fip5LPj2uF8DWFbQz3DlEsRkCbhQJ44neU80FkpUOR66dbwlo+uyY2s1whqQzbCWA Xf+vZTlHO3yLkj+KXVzbeQXLqQ2BdA/cYFyPQ/W9bPxggBCT7mNbk5gsI8/TUloVylO9r80tH L6aEBDMusIXVPn6S/OQF2sPG95GSp5qNwMzS2ME/GKaBfXPeVB/ZxKzYT89ubeBTpE91i4CoZ kN+QfmkZVyve44IUfmBVR+rTQ+RmV4l92mDSjbrdEb5ORrx2aJAmR4FkjpFPfTLputMhoqh5R WKGNsTtH5Y+pTM/ajT97n6ayQ4DNcb8QYjJ/2jVrAAOlRXUit8rFWgvh0NlJC9bSwkycVxBBD CDfehDsOtssBbvV39zjurWVSWRUE1I1FA/K4+n3jtSDaQUlG5W9qGgrhwtX2ftECyA31MkouV dO2ML2LL+QhnLuZOjzg+tt6EPkaI/ZBLOH9J3SXTfbVidmZa8SvcZjR4PSg2eTuJOqWiZnSGA /7jE0qs3LzAGgrVOi2qkQhH4sxFFPpMBpANXt+i9f6PESvHWSSzieNdsye0qm23pPri39kCHA vVOZQKjAc40Q24TSx3q9kaye9kZrAUqCItphEoMXdkCaXU3z3K0OKkNMdwMoDACCQBtfNqPI+ f3M/jJQrdmePa1d1WpBATeqXktemx5BGZsfHKBEMINkbCy25Kx7bbPShWsimDM8LOYGIzi3AI EvWxjtK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 19 May 2017 13:15:27 +0200 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 --- v2: This refactoring superseded the update suggestion "mmc: core: Delete an error message for a failed memory allocation in three functions" from 2017-05-13 because another adjustment was requested by Ulf Hansson. https://patchwork.kernel.org/patch/9725233/ https://lkml.org/lkml/2017/5/19/308 drivers/mmc/core/mmc_test.c | 2 -- drivers/mmc/core/sd.c | 16 +++------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index fd1b4b8510b9..7a304a6e5bf1 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c @@ -3220,8 +3220,6 @@ static int __mmc_test_register_dbgfs_file(struct mmc_card *card, df = kmalloc(sizeof(*df), GFP_KERNEL); if (!df) { debugfs_remove(file); - dev_err(&card->dev, - "Can't allocate memory for internal usage.\n"); return -ENOMEM; } diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index d109634fbfce..1d7542daecbe 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -294,12 +294,8 @@ static int mmc_read_switch(struct mmc_card *card) err = -EIO; status = kmalloc(64, GFP_KERNEL); - if (!status) { - pr_err("%s: could not allocate a buffer for " - "switch capabilities.\n", - mmc_hostname(card->host)); + if (!status) return -ENOMEM; - } /* * Find out the card's support bits with a mode 0 operation. @@ -359,11 +355,8 @@ int mmc_sd_switch_hs(struct mmc_card *card) return 0; status = kmalloc(64, GFP_KERNEL); - if (!status) { - pr_err("%s: could not allocate a buffer for " - "switch capabilities.\n", mmc_hostname(card->host)); + if (!status) return -ENOMEM; - } err = mmc_sd_switch(card, 1, 0, 1, status); if (err) @@ -596,11 +589,8 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card) return 0; status = kmalloc(64, GFP_KERNEL); - if (!status) { - pr_err("%s: could not allocate a buffer for " - "switch capabilities.\n", mmc_hostname(card->host)); + if (!status) return -ENOMEM; - } /* Set 4-bit bus width */ if ((card->host->caps & MMC_CAP_4_BIT_DATA) && -- 2.13.0