diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2011-08-10 05:46:28 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-08-13 14:50:31 -0400 |
| commit | 7435bb7950ba8a3cbfa6d0c01e92588562533a3f (patch) | |
| tree | b3ba7a528692233ab3303c210b8577a357c8db22 | |
| parent | 65be3fef930beb3e282e7f23dfba63289971430c (diff) | |
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>
| -rw-r--r-- | drivers/mmc/card/mmc_test.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/core/core.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/core/mmc_ops.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index 742dc98a034c..2bf229acd3b8 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c | |||
| @@ -224,7 +224,7 @@ static void mmc_test_prepare_mrq(struct mmc_test_card *test, | |||
| 224 | static int mmc_test_busy(struct mmc_command *cmd) | 224 | static int mmc_test_busy(struct mmc_command *cmd) |
| 225 | { | 225 | { |
| 226 | return !(cmd->resp[0] & R1_READY_FOR_DATA) || | 226 | return !(cmd->resp[0] & R1_READY_FOR_DATA) || |
| 227 | (R1_CURRENT_STATE(cmd->resp[0]) == 7); | 227 | (R1_CURRENT_STATE(cmd->resp[0]) == R1_STATE_PRG); |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | /* | 230 | /* |
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 89bdeaec7182..91a0a7460ebb 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
| @@ -1502,7 +1502,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, | |||
| 1502 | goto out; | 1502 | goto out; |
| 1503 | } | 1503 | } |
| 1504 | } while (!(cmd.resp[0] & R1_READY_FOR_DATA) || | 1504 | } while (!(cmd.resp[0] & R1_READY_FOR_DATA) || |
| 1505 | R1_CURRENT_STATE(cmd.resp[0]) == 7); | 1505 | R1_CURRENT_STATE(cmd.resp[0]) == R1_STATE_PRG); |
| 1506 | out: | 1506 | out: |
| 1507 | return err; | 1507 | return err; |
| 1508 | } | 1508 | } |
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 845ce7c533b9..770c3d06f5dc 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c | |||
| @@ -407,7 +407,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, | |||
| 407 | break; | 407 | break; |
| 408 | if (mmc_host_is_spi(card->host)) | 408 | if (mmc_host_is_spi(card->host)) |
| 409 | break; | 409 | break; |
| 410 | } while (R1_CURRENT_STATE(status) == 7); | 410 | } while (R1_CURRENT_STATE(status) == R1_STATE_PRG); |
| 411 | 411 | ||
| 412 | if (mmc_host_is_spi(card->host)) { | 412 | if (mmc_host_is_spi(card->host)) { |
| 413 | if (status & R1_SPI_ILLEGAL_COMMAND) | 413 | if (status & R1_SPI_ILLEGAL_COMMAND) |
