diff options
author | Zhao Hongjiang <zhaohongjiang@huawei.com> | 2013-07-08 03:22:50 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2013-07-08 04:23:15 -0400 |
commit | 0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd (patch) | |
tree | 3c9a1981692cf58324f5b068dbd9c23413d562e9 | |
parent | 478ba61afccd3a4d7ca662cadff1d35d183fe67d (diff) |
xtensa: remove the second argument of __bio_kmap_atomic()
kmap_atomic allows only one argument now, just remove the unused 'kmtype'.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r-- | arch/xtensa/platforms/iss/simdisk.c | 4 | ||||
-rw-r--r-- | include/linux/bio.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c index c0edb35424ce..8c6e819cd8ed 100644 --- a/arch/xtensa/platforms/iss/simdisk.c +++ b/arch/xtensa/platforms/iss/simdisk.c | |||
@@ -108,13 +108,13 @@ static int simdisk_xfer_bio(struct simdisk *dev, struct bio *bio) | |||
108 | sector_t sector = bio->bi_sector; | 108 | sector_t sector = bio->bi_sector; |
109 | 109 | ||
110 | bio_for_each_segment(bvec, bio, i) { | 110 | bio_for_each_segment(bvec, bio, i) { |
111 | char *buffer = __bio_kmap_atomic(bio, i, KM_USER0); | 111 | char *buffer = __bio_kmap_atomic(bio, i); |
112 | unsigned len = bvec->bv_len >> SECTOR_SHIFT; | 112 | unsigned len = bvec->bv_len >> SECTOR_SHIFT; |
113 | 113 | ||
114 | simdisk_transfer(dev, sector, len, buffer, | 114 | simdisk_transfer(dev, sector, len, buffer, |
115 | bio_data_dir(bio) == WRITE); | 115 | bio_data_dir(bio) == WRITE); |
116 | sector += len; | 116 | sector += len; |
117 | __bio_kunmap_atomic(bio, KM_USER0); | 117 | __bio_kunmap_atomic(bio); |
118 | } | 118 | } |
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
diff --git a/include/linux/bio.h b/include/linux/bio.h index ef24466d8f82..ec48bac5b039 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -97,11 +97,11 @@ static inline void *bio_data(struct bio *bio) | |||
97 | * permanent PIO fall back, user is probably better off disabling highmem | 97 | * permanent PIO fall back, user is probably better off disabling highmem |
98 | * I/O completely on that queue (see ide-dma for example) | 98 | * I/O completely on that queue (see ide-dma for example) |
99 | */ | 99 | */ |
100 | #define __bio_kmap_atomic(bio, idx, kmtype) \ | 100 | #define __bio_kmap_atomic(bio, idx) \ |
101 | (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \ | 101 | (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) + \ |
102 | bio_iovec_idx((bio), (idx))->bv_offset) | 102 | bio_iovec_idx((bio), (idx))->bv_offset) |
103 | 103 | ||
104 | #define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr) | 104 | #define __bio_kunmap_atomic(addr) kunmap_atomic(addr) |
105 | 105 | ||
106 | /* | 106 | /* |
107 | * merge helpers etc | 107 | * merge helpers etc |