diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-27 00:27:00 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-01-11 23:58:42 -0500 |
commit | 482fce997e143a8d5429406fe066d31aa76ef70a (patch) | |
tree | 00239e0bb360a137e9d261ce1be39faf9628c92e /drivers/mmc/host/tifm_sd.c | |
parent | d1f81a64a4250bdd776978be06ae2b8e13ec7471 (diff) |
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>
Diffstat (limited to 'drivers/mmc/host/tifm_sd.c')
-rw-r--r-- | drivers/mmc/host/tifm_sd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c index f70d04664cac..fc00081687b9 100644 --- a/drivers/mmc/host/tifm_sd.c +++ b/drivers/mmc/host/tifm_sd.c | |||
@@ -118,7 +118,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg, | |||
118 | unsigned char *buf; | 118 | unsigned char *buf; |
119 | unsigned int pos = 0, val; | 119 | unsigned int pos = 0, val; |
120 | 120 | ||
121 | buf = kmap_atomic(pg, KM_BIO_DST_IRQ) + off; | 121 | buf = kmap_atomic(pg) + off; |
122 | if (host->cmd_flags & DATA_CARRY) { | 122 | if (host->cmd_flags & DATA_CARRY) { |
123 | buf[pos++] = host->bounce_buf_data[0]; | 123 | buf[pos++] = host->bounce_buf_data[0]; |
124 | host->cmd_flags &= ~DATA_CARRY; | 124 | host->cmd_flags &= ~DATA_CARRY; |
@@ -134,7 +134,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg, | |||
134 | } | 134 | } |
135 | buf[pos++] = (val >> 8) & 0xff; | 135 | buf[pos++] = (val >> 8) & 0xff; |
136 | } | 136 | } |
137 | kunmap_atomic(buf - off, KM_BIO_DST_IRQ); | 137 | kunmap_atomic(buf - off); |
138 | } | 138 | } |
139 | 139 | ||
140 | static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg, | 140 | 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, | |||
144 | unsigned char *buf; | 144 | unsigned char *buf; |
145 | unsigned int pos = 0, val; | 145 | unsigned int pos = 0, val; |
146 | 146 | ||
147 | buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + off; | 147 | buf = kmap_atomic(pg) + off; |
148 | if (host->cmd_flags & DATA_CARRY) { | 148 | if (host->cmd_flags & DATA_CARRY) { |
149 | val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00); | 149 | val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00); |
150 | writel(val, sock->addr + SOCK_MMCSD_DATA); | 150 | writel(val, sock->addr + SOCK_MMCSD_DATA); |
@@ -161,7 +161,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg, | |||
161 | val |= (buf[pos++] << 8) & 0xff00; | 161 | val |= (buf[pos++] << 8) & 0xff00; |
162 | writel(val, sock->addr + SOCK_MMCSD_DATA); | 162 | writel(val, sock->addr + SOCK_MMCSD_DATA); |
163 | } | 163 | } |
164 | kunmap_atomic(buf - off, KM_BIO_SRC_IRQ); | 164 | kunmap_atomic(buf - off); |
165 | } | 165 | } |
166 | 166 | ||
167 | static void tifm_sd_transfer_data(struct tifm_sd *host) | 167 | 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, | |||
212 | struct page *src, unsigned int src_off, | 212 | struct page *src, unsigned int src_off, |
213 | unsigned int count) | 213 | unsigned int count) |
214 | { | 214 | { |
215 | unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off; | 215 | unsigned char *src_buf = kmap_atomic(src) + src_off; |
216 | unsigned char *dst_buf = kmap_atomic(dst, KM_BIO_DST_IRQ) + dst_off; | 216 | unsigned char *dst_buf = kmap_atomic(dst) + dst_off; |
217 | 217 | ||
218 | memcpy(dst_buf, src_buf, count); | 218 | memcpy(dst_buf, src_buf, count); |
219 | 219 | ||
220 | kunmap_atomic(dst_buf - dst_off, KM_BIO_DST_IRQ); | 220 | kunmap_atomic(dst_buf - dst_off); |
221 | kunmap_atomic(src_buf - src_off, KM_BIO_SRC_IRQ); | 221 | kunmap_atomic(src_buf - src_off); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) | 224 | static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) |