diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:22 -0500 |
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:19 -0400 |
| commit | eb3f06209412266f25c735db0b7699babf5fef9e (patch) | |
| tree | 4a4215df540818bf1e81328cb3cefd228c1e229f /drivers/memstick | |
| parent | b0b38c767e5a3ede700744fb6a99db7bc6e74553 (diff) | |
memstick: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 4 | ||||
| -rw-r--r-- | drivers/memstick/host/tifm_ms.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 5319e9b65847..c37d3756d8d2 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
| @@ -325,7 +325,7 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host) | |||
| 325 | p_cnt = min(p_cnt, length); | 325 | p_cnt = min(p_cnt, length); |
| 326 | 326 | ||
| 327 | local_irq_save(flags); | 327 | local_irq_save(flags); |
| 328 | buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + p_off; | 328 | buf = kmap_atomic(pg) + p_off; |
| 329 | } else { | 329 | } else { |
| 330 | buf = host->req->data + host->block_pos; | 330 | buf = host->req->data + host->block_pos; |
| 331 | p_cnt = host->req->data_len - host->block_pos; | 331 | p_cnt = host->req->data_len - host->block_pos; |
| @@ -341,7 +341,7 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host) | |||
| 341 | : jmb38x_ms_read_reg_data(host, buf, p_cnt); | 341 | : jmb38x_ms_read_reg_data(host, buf, p_cnt); |
| 342 | 342 | ||
| 343 | if (host->req->long_data) { | 343 | if (host->req->long_data) { |
| 344 | kunmap_atomic(buf - p_off, KM_BIO_SRC_IRQ); | 344 | kunmap_atomic(buf - p_off); |
| 345 | local_irq_restore(flags); | 345 | local_irq_restore(flags); |
| 346 | } | 346 | } |
| 347 | 347 | ||
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c index 6902b83eb1b4..7bafa72f8f57 100644 --- a/drivers/memstick/host/tifm_ms.c +++ b/drivers/memstick/host/tifm_ms.c | |||
| @@ -210,7 +210,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) | |||
| 210 | p_cnt = min(p_cnt, length); | 210 | p_cnt = min(p_cnt, length); |
| 211 | 211 | ||
| 212 | local_irq_save(flags); | 212 | local_irq_save(flags); |
| 213 | buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + p_off; | 213 | buf = kmap_atomic(pg) + p_off; |
| 214 | } else { | 214 | } else { |
| 215 | buf = host->req->data + host->block_pos; | 215 | buf = host->req->data + host->block_pos; |
| 216 | p_cnt = host->req->data_len - host->block_pos; | 216 | p_cnt = host->req->data_len - host->block_pos; |
| @@ -221,7 +221,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host) | |||
| 221 | : tifm_ms_read_data(host, buf, p_cnt); | 221 | : tifm_ms_read_data(host, buf, p_cnt); |
| 222 | 222 | ||
| 223 | if (host->req->long_data) { | 223 | if (host->req->long_data) { |
| 224 | kunmap_atomic(buf - p_off, KM_BIO_SRC_IRQ); | 224 | kunmap_atomic(buf - p_off); |
| 225 | local_irq_restore(flags); | 225 | local_irq_restore(flags); |
| 226 | } | 226 | } |
| 227 | 227 | ||