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

Commit 6606110d authored by Joe Perches's avatar Joe Perches Committed by Ulf Hansson
Browse files

mmc: Convert pr_warning to pr_warn 



Use the much more common pr_warn instead of pr_warning.

Other miscellanea:

o Coalesce formats
o Realign arguments
o Remove extra spaces when coalescing formats

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 48d11e06

drivers/mmc/card/block.c

+2 −2
Original line number Diff line number Diff line
@@ -1928,7 +1928,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
		case MMC_BLK_ECC_ERR:

			if (brq->data.blocks > 1) {

				/* Redo read one sector at a time */

				pr_warning("%s: retrying using single block read\n",

				pr_warn("%s: retrying using single block read\n",

					req->rq_disk->disk_name);

				disable_multi = 1;

				break;

drivers/mmc/card/queue.c

+2 −4
Original line number Diff line number Diff line
@@ -229,14 +229,12 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
		if (bouncesz > 512) {

			mqrq_cur->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);

			if (!mqrq_cur->bounce_buf) {

				pr_warning("%s: unable to "

					"allocate bounce cur buffer\n",

				pr_warn("%s: unable to allocate bounce cur buffer\n",

					mmc_card_name(card));

			}

			mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL);

			if (!mqrq_prev->bounce_buf) {

				pr_warning("%s: unable to "

					"allocate bounce prev buffer\n",

				pr_warn("%s: unable to allocate bounce prev buffer\n",

					mmc_card_name(card));

				kfree(mqrq_cur->bounce_buf);

				mqrq_cur->bounce_buf = NULL;

drivers/mmc/card/sdio_uart.c

+4 −5
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ static int sdio_uart_probe(struct sdio_func *func, 
		return -ENOMEM;



	if (func->class == SDIO_CLASS_UART) {

		pr_warning("%s: need info on UART class basic setup\n",

		pr_warn("%s: need info on UART class basic setup\n",

			sdio_func_id(func));

		kfree(port);

		return -ENOSYS;
@@ -1082,8 +1082,7 @@ static int sdio_uart_probe(struct sdio_func *func, 
				break;

		}

		if (!tpl) {

			pr_warning(

       "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",

			pr_warn("%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",

				sdio_func_id(func));

			kfree(port);

			return -EINVAL;

drivers/mmc/core/core.c

+4 −4
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static void mmc_wait_for_req_done(struct mmc_host *host, 
		 */

		if (cmd->sanitize_busy && cmd->error == -ETIMEDOUT) {

			if (!mmc_interrupt_hpi(host->card)) {

				pr_warning("%s: %s: Interrupted sanitize\n",

				pr_warn("%s: %s: Interrupted sanitize\n",

					mmc_hostname(host), __func__);

				cmd->error = 0;

				break;
@@ -1417,7 +1417,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr) 
	if (!host->ops->start_signal_voltage_switch)

		return -EPERM;

	if (!host->ops->card_busy)

		pr_warning("%s: cannot verify signal voltage switch\n",

		pr_warn("%s: cannot verify signal voltage switch\n",

			mmc_hostname(host));



	cmd.opcode = SD_SWITCH_VOLTAGE;

drivers/mmc/core/mmc.c

+7 −10
Original line number Diff line number Diff line
@@ -226,9 +226,7 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd) 
				"Card will be ignored.\n",

				mmc_hostname(card->host));

		} else {

			pr_warning("%s: unable to read "

				"EXT_CSD, performance might "

				"suffer.\n",

			pr_warn("%s: unable to read EXT_CSD, performance might suffer\n",

				mmc_hostname(card->host));

			err = 0;

		}
@@ -816,8 +814,8 @@ static int __mmc_select_powerclass(struct mmc_card *card, 
				ext_csd->raw_pwr_cl_200_360;

		break;

	default:

		pr_warning("%s: Voltage range not supported "

			   "for power class.\n", mmc_hostname(host));

		pr_warn("%s: Voltage range not supported for power class\n",

			mmc_hostname(host));

		return -EINVAL;

	}
@@ -1490,7 +1488,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		if (err && err != -EBADMSG)

			goto free_card;

		if (err) {

			pr_warning("%s: Enabling HPI failed\n",

			pr_warn("%s: Enabling HPI failed\n",

				mmc_hostname(card->host));

			err = 0;

		} else
@@ -1512,8 +1510,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		 * Only if no error, cache is turned on successfully.

		 */

		if (err) {

			pr_warning("%s: Cache is supported, "

					"but failed to turn on (%d)\n",

			pr_warn("%s: Cache is supported, but failed to turn on (%d)\n",

				mmc_hostname(card->host), err);

			card->ext_csd.cache_ctrl = 0;

			err = 0;