diff options
author | Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br> | 2008-03-26 16:08:41 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-04-18 14:05:27 -0400 |
commit | 5ec21b1ccf554593d25fba0f411c03e1d6fd88c5 (patch) | |
tree | 18fc5677b32b052951a19a555a90954fef9e058f /drivers/mmc | |
parent | 6fee65cfde519ae811c3cde47c622271168ca449 (diff) |
MMC: OMAP: Remove some opcodes from host driver
This patch removes some opcodes from host driver so there's no need on putting
'#include <linux/mmc/mmc.h>', that should not be needed in host drivers.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/omap.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 90c358b57d1c..da70467915d6 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id) | |||
495 | if (status & OMAP_MMC_STAT_CMD_TOUT) { | 495 | if (status & OMAP_MMC_STAT_CMD_TOUT) { |
496 | /* Timeouts are routine with some commands */ | 496 | /* Timeouts are routine with some commands */ |
497 | if (host->cmd) { | 497 | if (host->cmd) { |
498 | if (host->cmd->opcode != MMC_ALL_SEND_CID && | 498 | if (!mmc_omap_cover_is_open(host)) |
499 | host->cmd->opcode != | ||
500 | MMC_SEND_OP_COND && | ||
501 | host->cmd->opcode != | ||
502 | MMC_APP_CMD && | ||
503 | !mmc_omap_cover_is_open(host)) | ||
504 | dev_err(mmc_dev(host->mmc), | 499 | dev_err(mmc_dev(host->mmc), |
505 | "command timeout, CMD %d\n", | 500 | "command timeout, CMD %d\n", |
506 | host->cmd->opcode); | 501 | host->cmd->opcode); |
507 | host->cmd->error = -ETIMEDOUT; | 502 | host->cmd->error = -ETIMEDOUT; |
508 | end_command = 1; | 503 | end_command = 1; |
509 | } | 504 | } |