diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
| commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
| tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /drivers/mmc/host/tmio_mmc.h | |
| parent | 977ddd6b2e63716cfefe669bbdb30ec0bcea1fe4 (diff) | |
| parent | 3894335876a6257ac46e14845bd37ae6fb0f7c87 (diff) | |
| download | linux-c91925db4925ba0d145478f02c093369196936e9.tar.gz linux-c91925db4925ba0d145478f02c093369196936e9.tar.bz2 linux-c91925db4925ba0d145478f02c093369196936e9.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/mmc/host/tmio_mmc.h')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 64f7d5dfc106..0fedc78e3ea5 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -82,10 +82,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) @@ -177,19 +174,17 @@ static inline int tmio_mmc_next_sg(struct tmio_mmc_host *host) 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); } |