Commit 02098ccd authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Drop redundant in-parameter to __mmc_switch() 



The use_busy_signal in-parameter is set true by all callers of
__mmc_switch(), hence it's redundant so drop it.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarBaolin Wang <baolin.wang7@gmail.com>
Tested-by: default avatarLudovic Barre <ludovic.barre@st.com>
Reviewed-by: default avatarLudovic Barre <ludovic.barre@st.com>
Link: https://lore.kernel.org/r/20200204085449.32585-5-ulf.hansson@linaro.org
parent 60db8a47

drivers/mmc/core/mmc.c

+11 −11
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static int mmc_select_hs(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,

			   card->ext_csd.generic_cmd6_time, MMC_TIMING_MMC_HS,

			   true, true, true);

			   true, true);

	if (err)

		pr_warn("%s: switch to high-speed failed, err:%d\n",

			mmc_hostname(card->host), err);
@@ -1087,7 +1087,7 @@ static int mmc_select_hs_ddr(struct mmc_card *card) 
			   ext_csd_bits,

			   card->ext_csd.generic_cmd6_time,

			   MMC_TIMING_MMC_DDR52,

			   true, true, true);

			   true, true);

	if (err) {

		pr_err("%s: switch to bus width %d ddr failed\n",

			mmc_hostname(host), 1 << bus_width);
@@ -1155,7 +1155,7 @@ static int mmc_select_hs400(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err) {

		pr_err("%s: switch to high-speed from hs200 failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1197,7 +1197,7 @@ static int mmc_select_hs400(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err) {

		pr_err("%s: switch to hs400 failed, err:%d\n",

			 mmc_hostname(host), err);
@@ -1243,7 +1243,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	val = EXT_CSD_TIMING_HS;

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,

			   val, card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err)

		goto out_err;
@@ -1256,7 +1256,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	/* Switch HS DDR to HS */

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,

			   EXT_CSD_BUS_WIDTH_8, card->ext_csd.generic_cmd6_time,

			   0, true, false, true);

			   0, false, true);

	if (err)

		goto out_err;
@@ -1274,7 +1274,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,

			   val, card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err)

		goto out_err;
@@ -1358,7 +1358,7 @@ static int mmc_select_hs400es(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,

			   card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err) {

		pr_err("%s: switch to hs for hs400es failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1392,7 +1392,7 @@ static int mmc_select_hs400es(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   true, false, true);

			   false, true);

	if (err) {

		pr_err("%s: switch to hs400es failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1457,7 +1457,7 @@ static int mmc_select_hs200(struct mmc_card *card) 
		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				   EXT_CSD_HS_TIMING, val,

				   card->ext_csd.generic_cmd6_time, 0,

				   true, false, true);

				   false, true);

		if (err)

			goto err;

		old_timing = host->ios.timing;
@@ -1962,7 +1962,7 @@ static int mmc_poweroff_notify(struct mmc_card *card, unsigned int notify_type) 


	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			EXT_CSD_POWER_OFF_NOTIFICATION,

			notify_type, timeout, 0, true, false, false);

			notify_type, timeout, 0, false, false);

	if (err)

		pr_err("%s: Power Off Notification timed out, %u\n",

		       mmc_hostname(card->host), timeout);

drivers/mmc/core/mmc_ops.c

+3 −8
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 
 *	@timeout_ms: timeout (ms) for operation performed by register write,

 *                   timeout of zero implies maximum possible timeout

 *	@timing: new timing to change to

 *	@use_busy_signal: use the busy signal as response type

 *	@send_status: send status cmd to poll for busy

 *	@retry_crc_err: retry when CRC errors when polling with CMD13 for busy

 *
@@ -524,12 +523,12 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 
 */

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool use_busy_signal, bool send_status,	bool retry_crc_err)

		bool send_status, bool retry_crc_err)

{

	struct mmc_host *host = card->host;

	int err;

	struct mmc_command cmd = {};

	bool use_r1b_resp = use_busy_signal;

	bool use_r1b_resp = true;

	unsigned char old_timing = host->ios.timing;



	mmc_retune_hold(host);
@@ -571,10 +570,6 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
	if (err)

		goto out;



	/* No need to check card status in case of unblocking command */

	if (!use_busy_signal)

		goto out;



	/*If SPI or used HW busy detection above, then we don't need to poll. */

	if (((host->caps & MMC_CAP_WAIT_WHILE_BUSY) && use_r1b_resp) ||

		mmc_host_is_spi(host))
@@ -605,7 +600,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		unsigned int timeout_ms)

{

	return __mmc_switch(card, set, index, value, timeout_ms, 0,

			true, true, false);

			    true, false);

}

EXPORT_SYMBOL_GPL(mmc_switch);

drivers/mmc/core/mmc_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd); 
int mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool use_busy_signal, bool send_status,	bool retry_crc_err);

		bool send_status, bool retry_crc_err);

int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms);

void mmc_run_bkops(struct mmc_card *card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE