mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mmc: remove the second argument of k[un]map_atomic() 

Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Cong Wang 2011-11-27 13:27:00 +08:00 committed by Chris Ball
parent d1f81a64a4
commit 482fce997e
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/at91_mci.c
View File

@ -236,7 +236,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
sg = &data->sg[i]; sg = &data->sg[i];
sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; sgbuffer = kmap_atomic(sg_page(sg)) + sg->offset;
amount = min(size, sg->length); amount = min(size, sg->length);
size -= amount; size -= amount;
@ -252,7 +252,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
dmabuf = (unsigned *)tmpv; dmabuf = (unsigned *)tmpv;
} }
kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ); kunmap_atomic(sgbuffer);
if (size == 0) if (size == 0)
break; break;
@ -302,7 +302,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)
sg = &data->sg[i]; sg = &data->sg[i];
sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; sgbuffer = kmap_atomic(sg_page(sg)) + sg->offset;
amount = min(size, sg->length); amount = min(size, sg->length);
size -= amount; size -= amount;
@ -318,7 +318,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)
} }
flush_kernel_dcache_page(sg_page(sg)); flush_kernel_dcache_page(sg_page(sg));
kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ); kunmap_atomic(sgbuffer);
data->bytes_xfered += amount; data->bytes_xfered += amount;
if (size == 0) if (size == 0)
break; break;

6
drivers/mmc/host/msm_sdcc.c
View File

@ -689,8 +689,8 @@ msmsdcc_pio_irq(int irq, void *dev_id)
/* Map the current scatter buffer */ /* Map the current scatter buffer */
local_irq_save(flags); local_irq_save(flags);
buffer = kmap_atomic(sg_page(host->pio.sg), buffer = kmap_atomic(sg_page(host->pio.sg))
KM_BIO_SRC_IRQ) + host->pio.sg->offset; + host->pio.sg->offset;
buffer += host->pio.sg_off; buffer += host->pio.sg_off;
remain = host->pio.sg->length - host->pio.sg_off; remain = host->pio.sg->length - host->pio.sg_off;
len = 0; len = 0;
@ -700,7 +700,7 @@ msmsdcc_pio_irq(int irq, void *dev_id)
len = msmsdcc_pio_write(host, buffer, remain, status); len = msmsdcc_pio_write(host, buffer, remain, status);
/* Unmap the buffer */ /* Unmap the buffer */
kunmap_atomic(buffer, KM_BIO_SRC_IRQ); kunmap_atomic(buffer);
local_irq_restore(flags); local_irq_restore(flags);
host->pio.sg_off += len; host->pio.sg_off += len;

4
drivers/mmc/host/sdhci.c
View File

@ -423,12 +423,12 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags) static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags)
{ {
local_irq_save(*flags); local_irq_save(*flags);
return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; return kmap_atomic(sg_page(sg)) + sg->offset;
} }
static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags) static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
{ {
kunmap_atomic(buffer, KM_BIO_SRC_IRQ); kunmap_atomic(buffer);
local_irq_restore(*flags); local_irq_restore(*flags);
} }

16
drivers/mmc/host/tifm_sd.c
View File

@ -118,7 +118,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,
unsigned char *buf; unsigned char *buf;
unsigned int pos = 0, val; unsigned int pos = 0, val;
buf = kmap_atomic(pg, KM_BIO_DST_IRQ) + off; buf = kmap_atomic(pg) + off;
if (host->cmd_flags & DATA_CARRY) { if (host->cmd_flags & DATA_CARRY) {
buf[pos++] = host->bounce_buf_data[0]; buf[pos++] = host->bounce_buf_data[0];
host->cmd_flags &= ~DATA_CARRY; host->cmd_flags &= ~DATA_CARRY;
@ -134,7 +134,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,
} }
buf[pos++] = (val >> 8) & 0xff; buf[pos++] = (val >> 8) & 0xff;
} }
kunmap_atomic(buf - off, KM_BIO_DST_IRQ); kunmap_atomic(buf - off);
} }
static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg, static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
@ -144,7 +144,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
unsigned char *buf; unsigned char *buf;
unsigned int pos = 0, val; unsigned int pos = 0, val;
buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + off; buf = kmap_atomic(pg) + off;
if (host->cmd_flags & DATA_CARRY) { if (host->cmd_flags & DATA_CARRY) {
val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00); val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00);
writel(val, sock->addr + SOCK_MMCSD_DATA); writel(val, sock->addr + SOCK_MMCSD_DATA);
@ -161,7 +161,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
val |= (buf[pos++] << 8) & 0xff00; val |= (buf[pos++] << 8) & 0xff00;
writel(val, sock->addr + SOCK_MMCSD_DATA); writel(val, sock->addr + SOCK_MMCSD_DATA);
} }
kunmap_atomic(buf - off, KM_BIO_SRC_IRQ); kunmap_atomic(buf - off);
} }
static void tifm_sd_transfer_data(struct tifm_sd *host) static void tifm_sd_transfer_data(struct tifm_sd *host)
@ -212,13 +212,13 @@ static void tifm_sd_copy_page(struct page *dst, unsigned int dst_off,
struct page *src, unsigned int src_off, struct page *src, unsigned int src_off,
unsigned int count) unsigned int count)
{ {
unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off; unsigned char *src_buf = kmap_atomic(src) + src_off;
unsigned char *dst_buf = kmap_atomic(dst, KM_BIO_DST_IRQ) + dst_off; unsigned char *dst_buf = kmap_atomic(dst) + dst_off;
memcpy(dst_buf, src_buf, count); memcpy(dst_buf, src_buf, count);
kunmap_atomic(dst_buf - dst_off, KM_BIO_DST_IRQ); kunmap_atomic(dst_buf - dst_off);
kunmap_atomic(src_buf - src_off, KM_BIO_SRC_IRQ); kunmap_atomic(src_buf - src_off);
} }
static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data)

4
drivers/mmc/host/tmio_mmc.h
View File

@ -105,13 +105,13 @@ static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,
unsigned long *flags) unsigned long *flags)
{ {
local_irq_save(*flags); local_irq_save(*flags);
return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; return kmap_atomic(sg_page(sg)) + sg->offset;
} }
static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg, static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,
unsigned long *flags, void *virt) unsigned long *flags, void *virt)
{ {
kunmap_atomic(virt - sg->offset, KM_BIO_SRC_IRQ); kunmap_atomic(virt - sg->offset);
local_irq_restore(*flags); local_irq_restore(*flags);
} }