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

Commit 0899e741 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: remove unnecessary assignment statements before return 



Variable assignment just before return is redundant.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 62c03ca3

drivers/mmc/core/mmc_ops.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -90,7 +90,6 @@ int mmc_send_status(struct mmc_card *card, u32 *status) 




static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card)

static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card)

{

{

	int err;

	struct mmc_command cmd = {0};

	struct mmc_command cmd = {0};





	BUG_ON(!host);

	BUG_ON(!host);
@@ -105,11 +104,7 @@ static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card) 
		cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;

		cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;

	}

	}





	err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);

	return mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);

	if (err)

		return err;



	return 0;

}

}





int mmc_select_card(struct mmc_card *card)

int mmc_select_card(struct mmc_card *card)
@@ -244,7 +239,6 @@ int mmc_all_send_cid(struct mmc_host *host, u32 *cid) 




int mmc_set_relative_addr(struct mmc_card *card)

int mmc_set_relative_addr(struct mmc_card *card)

{

{

	int err;

	struct mmc_command cmd = {0};

	struct mmc_command cmd = {0};





	BUG_ON(!card);

	BUG_ON(!card);
@@ -254,11 +248,7 @@ int mmc_set_relative_addr(struct mmc_card *card) 
	cmd.arg = card->rca << 16;

	cmd.arg = card->rca << 16;

	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;

	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;





	err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);

	return mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);

	if (err)

		return err;



	return 0;

}

}





static int

static int
@@ -743,7 +733,7 @@ mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode, 




int mmc_bus_test(struct mmc_card *card, u8 bus_width)

int mmc_bus_test(struct mmc_card *card, u8 bus_width)

{

{

	int err, width;

	int width;





	if (bus_width == MMC_BUS_WIDTH_8)

	if (bus_width == MMC_BUS_WIDTH_8)

		width = 8;

		width = 8;
@@ -759,8 +749,7 @@ int mmc_bus_test(struct mmc_card *card, u8 bus_width) 
	 * is a problem.  This improves chances that the test will work.

	 * is a problem.  This improves chances that the test will work.

	 */

	 */

	mmc_send_bus_test(card, card->host, MMC_BUS_TEST_W, width);

	mmc_send_bus_test(card, card->host, MMC_BUS_TEST_W, width);

	err = mmc_send_bus_test(card, card->host, MMC_BUS_TEST_R, width);

	return mmc_send_bus_test(card, card->host, MMC_BUS_TEST_R, width);

	return err;

}

}





int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status)

int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status)

drivers/mmc/core/sd_ops.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -120,7 +120,6 @@ EXPORT_SYMBOL(mmc_wait_for_app_cmd); 




int mmc_app_set_bus_width(struct mmc_card *card, int width)

int mmc_app_set_bus_width(struct mmc_card *card, int width)

{

{

	int err;

	struct mmc_command cmd = {0};

	struct mmc_command cmd = {0};





	BUG_ON(!card);

	BUG_ON(!card);
@@ -140,11 +139,7 @@ int mmc_app_set_bus_width(struct mmc_card *card, int width) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	err = mmc_wait_for_app_cmd(card->host, card, &cmd, MMC_CMD_RETRIES);

	return mmc_wait_for_app_cmd(card->host, card, &cmd, MMC_CMD_RETRIES);

	if (err)

		return err;



	return 0;

}

}





int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)

int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)

drivers/mmc/core/sdio_ops.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -217,7 +217,6 @@ int sdio_reset(struct mmc_host *host) 
	else

	else

		abort |= 0x08;

		abort |= 0x08;





	ret = mmc_io_rw_direct_host(host, 1, 0, SDIO_CCCR_ABORT, abort, NULL);

	return mmc_io_rw_direct_host(host, 1, 0, SDIO_CCCR_ABORT, abort, NULL);

	return ret;

}

}