public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
	Bojan Prtvar <prtvar.b@gmail.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Paul Burton <paul.burton@imgtec.com>,
	Shawn Lin <shawn.lin@rock-chips.com>,
	Tomas Winkler <tomas.winkler@intel.com>,
	Uri Yanai <uri.yanai@sandisk.com>,
	Wolfram Sang <wsa@the-dreams.de>,
	LKML <linux-kernel@vger.kernel.org>,
	kernel-janitors@vger.kernel.org
Subject: [PATCH v2] mmc: core: Delete an error message for a failed memory allocation in four functions
Date: Fri, 19 May 2017 13:34:44 +0200	[thread overview]
Message-ID: <0ce8f8ac-d340-3f15-a698-ddfa449508e1@users.sourceforge.net> (raw)
In-Reply-To: <CAPDyKFraTYQWAqSNdZG_bRpbDiLFw4nigVzC1nkmrfnr2aw2og@mail.gmail.com>

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---

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


  reply	other threads:[~2017-05-19 11:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-13 12:54 [PATCH] mmc: core: Delete an error message for a failed memory allocation in three functions SF Markus Elfring
2017-05-13 17:24 ` Winkler, Tomas
2017-05-19  7:49 ` Ulf Hansson
2017-05-19  9:39   ` SF Markus Elfring
2017-05-19 10:00     ` Ulf Hansson
2017-05-19 11:34       ` SF Markus Elfring [this message]
2017-05-22 12:03         ` [PATCH v2] mmc: core: Delete an error message for a failed memory allocation in four functions Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0ce8f8ac-d340-3f15-a698-ddfa449508e1@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=paul.burton@imgtec.com \
    --cc=prtvar.b@gmail.com \
    --cc=shawn.lin@rock-chips.com \
    --cc=tomas.winkler@intel.com \
    --cc=ulf.hansson@linaro.org \
    --cc=uri.yanai@sandisk.com \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox