The patch titled mmc: omap: remove some opcodes from host driver has been removed from the -mm tree. Its filename was mmc-omap-remove-some-opcodes-from-host-driver.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mmc: omap: remove some opcodes from host driver From: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> 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@xxxxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Pierre Ossman <drzeus-list@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/omap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff -puN drivers/mmc/host/omap.c~mmc-omap-remove-some-opcodes-from-host-driver drivers/mmc/host/omap.c --- a/drivers/mmc/host/omap.c~mmc-omap-remove-some-opcodes-from-host-driver +++ a/drivers/mmc/host/omap.c @@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, if (status & OMAP_MMC_STAT_CMD_TOUT) { /* Timeouts are routine with some commands */ if (host->cmd) { - if (host->cmd->opcode != MMC_ALL_SEND_CID && - host->cmd->opcode != - MMC_SEND_OP_COND && - host->cmd->opcode != - MMC_APP_CMD && - !mmc_omap_cover_is_open(host)) + if (!mmc_omap_cover_is_open(host)) dev_err(mmc_dev(host->mmc), - "command timeout, CMD %d\n", - host->cmd->opcode); + "command timeout, CMD %d\n", + host->cmd->opcode); host->cmd->error = -ETIMEDOUT; end_command = 1; } _ Patches currently in -mm which might be from carlos.aguiar@xxxxxxxxxxx are mmc-omap-remove-some-opcodes-from-host-driver.patch mmc-omap-remove-extra-divisor-increase.patch mmc-omap-fix-the-byteblock-capability-removal.patch mmc-omap-remove-cover-switch-handling-to-allow-adding-multislot-support.patch mmc-omap-introduce-new-multislot-structure-and-change-driver-to-use-it.patch mmc-omap-add-back-cover-switch-support.patch mmc-omap-new-release-dma-and-abort-xfer-functions.patch mmc-omap-fix-timeout-calculation-for-mmc-multislot-support.patch mmc-omap-power-functions-modified-to-mmc-multislot-support.patch mmc-omap-general-cleanup-for-mmc-multislot-support.patch mmc-omap-abort-stuck-commands.patch mmc-omap-using-setup_timer-instead-of-init_timer.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html