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

Commit 7435bb79 authored Aug 10, 2011 by Jaehoon Chung Committed by Chris Ball Aug 13, 2011

mmc: core: use defined R1_STATE_PRG macro for card status



Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent 65be3fef

drivers/mmc/card/mmc_test.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -224,7 +224,7 @@ static void mmc_test_prepare_mrq(struct mmc_test_card *test,
	static int mmc_test_busy(struct mmc_command *cmd)		static int mmc_test_busy(struct mmc_command *cmd)
	{		{
	return !(cmd->resp[0] & R1_READY_FOR_DATA) \|\|		return !(cmd->resp[0] & R1_READY_FOR_DATA) \|\|
	(R1_CURRENT_STATE(cmd->resp[0]) == 7);		(R1_CURRENT_STATE(cmd->resp[0]) == R1_STATE_PRG);
	}		}

	/*		/*

drivers/mmc/core/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1502,7 +1502,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
	goto out;		goto out;
	}		}
	} while (!(cmd.resp[0] & R1_READY_FOR_DATA) \|\|		} while (!(cmd.resp[0] & R1_READY_FOR_DATA) \|\|
	R1_CURRENT_STATE(cmd.resp[0]) == 7);		R1_CURRENT_STATE(cmd.resp[0]) == R1_STATE_PRG);
	out:		out:
	return err;		return err;
	}		}

drivers/mmc/core/mmc_ops.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -407,7 +407,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
	break;		break;
	if (mmc_host_is_spi(card->host))		if (mmc_host_is_spi(card->host))
	break;		break;
	} while (R1_CURRENT_STATE(status) == 7);		} while (R1_CURRENT_STATE(status) == R1_STATE_PRG);

	if (mmc_host_is_spi(card->host)) {		if (mmc_host_is_spi(card->host)) {
	if (status & R1_SPI_ILLEGAL_COMMAND)		if (status & R1_SPI_ILLEGAL_COMMAND)