pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x())

Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Cliff Brake 2009-01-22 16:58:58 -05:00 committed by Pierre Ossman
parent 06cc1c8800
commit e10a854c46

View file

@ -251,18 +251,17 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
if (stat & STAT_TIME_OUT_RESPONSE) { if (stat & STAT_TIME_OUT_RESPONSE) {
cmd->error = -ETIMEDOUT; cmd->error = -ETIMEDOUT;
} else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) { } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) {
#ifdef CONFIG_PXA27x
/* /*
* workaround for erratum #42: * workaround for erratum #42:
* Intel PXA27x Family Processor Specification Update Rev 001 * Intel PXA27x Family Processor Specification Update Rev 001
* A bogus CRC error can appear if the msb of a 136 bit * A bogus CRC error can appear if the msb of a 136 bit
* response is a one. * response is a one.
*/ */
if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) { if (cpu_is_pxa27x() &&
(cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000))
pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode); pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
} else else
#endif cmd->error = -EILSEQ;
cmd->error = -EILSEQ;
} }
pxamci_disable_irq(host, END_CMD_RES); pxamci_disable_irq(host, END_CMD_RES);