--- drivers/mmc/host/tmio_mmc.h

+++ drivers/mmc/host/tmio_mmc.h

@@ -102,10 +102,7 @@

#define ack_mmc_irqs(host, i) \

do { \

- u32 mask;\

- mask = sd_ctrl_read32((host), CTL_STATUS); \

- mask &= ~((i) & TMIO_MASK_IRQ); \

- sd_ctrl_write32((host), CTL_STATUS, mask); \

+ sd_ctrl_write32((host), CTL_STATUS, ~(i)); \

} while (0)

@@ -200,19 +197,17 @@ static inline int tmio_mmc_next_sg(struc

return --host->sg_len;

}

-static inline char *tmio_mmc_kmap_atomic(struct tmio_mmc_host *host,

+static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,

unsigned long *flags)

{

- struct scatterlist *sg = host->sg_ptr;

-

local_irq_save(*flags);

return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;

}

-static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,

+static inline void tmio_mmc_kunmap_atomic(void *virt,

unsigned long *flags)

{

- kunmap_atomic(sg_page(host->sg_ptr), KM_BIO_SRC_IRQ);

+ kunmap_atomic(virt, KM_BIO_SRC_IRQ);

local_irq_restore(*flags);

}