Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eb5afb3 authored by Zhao Hongjiang's avatar Zhao Hongjiang Committed by Chris Zankel
Browse files

xtensa: remove the second argument of __bio_kmap_atomic() 



kmap_atomic allows only one argument now, just remove the unused 'kmtype'.

Signed-off-by: default avatarZhao Hongjiang <zhaohongjiang@huawei.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 478ba61a

arch/xtensa/platforms/iss/simdisk.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -108,13 +108,13 @@ static int simdisk_xfer_bio(struct simdisk *dev, struct bio *bio) 
	sector_t sector = bio->bi_sector;

	sector_t sector = bio->bi_sector;





	bio_for_each_segment(bvec, bio, i) {

	bio_for_each_segment(bvec, bio, i) {

		char *buffer = __bio_kmap_atomic(bio, i, KM_USER0);

		char *buffer = __bio_kmap_atomic(bio, i);

		unsigned len = bvec->bv_len >> SECTOR_SHIFT;

		unsigned len = bvec->bv_len >> SECTOR_SHIFT;





		simdisk_transfer(dev, sector, len, buffer,

		simdisk_transfer(dev, sector, len, buffer,

				bio_data_dir(bio) == WRITE);

				bio_data_dir(bio) == WRITE);

		sector += len;

		sector += len;

		__bio_kunmap_atomic(bio, KM_USER0);

		__bio_kunmap_atomic(bio);

	}

	}

	return 0;

	return 0;

}

}

include/linux/bio.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -97,11 +97,11 @@ static inline void *bio_data(struct bio *bio) 
 * permanent PIO fall back, user is probably better off disabling highmem

 * permanent PIO fall back, user is probably better off disabling highmem

 * I/O completely on that queue (see ide-dma for example)

 * I/O completely on that queue (see ide-dma for example)

 */

 */

#define __bio_kmap_atomic(bio, idx, kmtype)				\

#define __bio_kmap_atomic(bio, idx)				\

	(kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) +	\

	(kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) +	\

		bio_iovec_idx((bio), (idx))->bv_offset)

		bio_iovec_idx((bio), (idx))->bv_offset)





#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr)

#define __bio_kunmap_atomic(addr) kunmap_atomic(addr)





/*

/*

 * merge helpers etc

 * merge helpers etc