diff options
Diffstat (limited to 'drivers/mmc/mmc.c')
-rw-r--r-- | drivers/mmc/mmc.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 1888060c5e0c..da6ddd910fc5 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
@@ -27,12 +27,6 @@ | |||
27 | 27 | ||
28 | #include "mmc.h" | 28 | #include "mmc.h" |
29 | 29 | ||
30 | #ifdef CONFIG_MMC_DEBUG | ||
31 | #define DBG(x...) printk(KERN_DEBUG x) | ||
32 | #else | ||
33 | #define DBG(x...) do { } while (0) | ||
34 | #endif | ||
35 | |||
36 | #define CMD_RETRIES 3 | 30 | #define CMD_RETRIES 3 |
37 | 31 | ||
38 | /* | 32 | /* |
@@ -77,8 +71,9 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) | |||
77 | { | 71 | { |
78 | struct mmc_command *cmd = mrq->cmd; | 72 | struct mmc_command *cmd = mrq->cmd; |
79 | int err = mrq->cmd->error; | 73 | int err = mrq->cmd->error; |
80 | DBG("MMC: req done (%02x): %d: %08x %08x %08x %08x\n", cmd->opcode, | 74 | pr_debug("MMC: req done (%02x): %d: %08x %08x %08x %08x\n", |
81 | err, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]); | 75 | cmd->opcode, err, cmd->resp[0], cmd->resp[1], |
76 | cmd->resp[2], cmd->resp[3]); | ||
82 | 77 | ||
83 | if (err && cmd->retries) { | 78 | if (err && cmd->retries) { |
84 | cmd->retries--; | 79 | cmd->retries--; |
@@ -102,8 +97,8 @@ EXPORT_SYMBOL(mmc_request_done); | |||
102 | void | 97 | void |
103 | mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) | 98 | mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) |
104 | { | 99 | { |
105 | DBG("MMC: starting cmd %02x arg %08x flags %08x\n", | 100 | pr_debug("MMC: starting cmd %02x arg %08x flags %08x\n", |
106 | mrq->cmd->opcode, mrq->cmd->arg, mrq->cmd->flags); | 101 | mrq->cmd->opcode, mrq->cmd->arg, mrq->cmd->flags); |
107 | 102 | ||
108 | WARN_ON(host->card_busy == NULL); | 103 | WARN_ON(host->card_busy == NULL); |
109 | 104 | ||
@@ -976,8 +971,8 @@ static unsigned int mmc_calculate_clock(struct mmc_host *host) | |||
976 | if (!mmc_card_dead(card) && max_dtr > card->csd.max_dtr) | 971 | if (!mmc_card_dead(card) && max_dtr > card->csd.max_dtr) |
977 | max_dtr = card->csd.max_dtr; | 972 | max_dtr = card->csd.max_dtr; |
978 | 973 | ||
979 | DBG("MMC: selected %d.%03dMHz transfer rate\n", | 974 | pr_debug("MMC: selected %d.%03dMHz transfer rate\n", |
980 | max_dtr / 1000000, (max_dtr / 1000) % 1000); | 975 | max_dtr / 1000000, (max_dtr / 1000) % 1000); |
981 | 976 | ||
982 | return max_dtr; | 977 | return max_dtr; |
983 | } | 978 | } |