bna: ioc cleanups

[~andy/linux] / drivers / block / pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index d59edeabd93f0b178306f49d6ff3e0376a6f3505..ba66e4445f412a3c6d3321de8050ad937d902deb 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -987,14 +987,14 @@ static void pkt_copy_bio_data(struct bio *src_bio, int seg, int offs, struct pag
 
        while (copy_size > 0) {
                struct bio_vec *src_bvl = bio_iovec_idx(src_bio, seg);
-               void *vfrom = kmap_atomic(src_bvl->bv_page, KM_USER0) +
+               void *vfrom = kmap_atomic(src_bvl->bv_page) +
                        src_bvl->bv_offset + offs;
                void *vto = page_address(dst_page) + dst_offs;
                int len = min_t(int, copy_size, src_bvl->bv_len - offs);
 
                BUG_ON(len < 0);
                memcpy(vto, vfrom, len);
-               kunmap_atomic(vfrom, KM_USER0);
+               kunmap_atomic(vfrom);
 
                seg++;
                offs = 0;
@@ -1019,10 +1019,10 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec)
        offs = 0;
        for (f = 0; f < pkt->frames; f++) {
                if (bvec[f].bv_page != pkt->pages[p]) {
-                       void *vfrom = kmap_atomic(bvec[f].bv_page, KM_USER0) + bvec[f].bv_offset;
+                       void *vfrom = kmap_atomic(bvec[f].bv_page) + bvec[f].bv_offset;
                        void *vto = page_address(pkt->pages[p]) + offs;
                        memcpy(vto, vfrom, CD_FRAMESIZE);
-                       kunmap_atomic(vfrom, KM_USER0);
+                       kunmap_atomic(vfrom);
                        bvec[f].bv_page = pkt->pages[p];
                        bvec[f].bv_offset = offs;
                } else {