Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1df7ae3 authored by Markus Elfring's avatar Markus Elfring Committed by Ulf Hansson
Browse files

mmc: core: Delete error messages for failed memory allocations 

Omit an extra message for memory allocation failures.

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 9b344ba4

drivers/mmc/core/mmc_test.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/mmc/core/sd.c

+3 −13
Original line number Diff line number Diff line
@@ -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) &&