Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / sd_dif.c

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index f8fb2d691c0a69e6aed9385ba1a81d2cb893967c..e52d5bc42bc47330d2ff9b658c6eec33a9143da5 100644 (file)
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -392,7 +392,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s
                virt = bio->bi_integrity->bip_sector & 0xffffffff;
 
                bip_for_each_vec(iv, bio->bi_integrity, i) {
-                       sdt = kmap_atomic(iv->bv_page, KM_USER0)
+                       sdt = kmap_atomic(iv->bv_page)
                                + iv->bv_offset;
 
                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
@@ -405,7 +405,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s
                                phys++;
                        }
 
-                       kunmap_atomic(sdt, KM_USER0);
+                       kunmap_atomic(sdt);
                }
 
                bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY);
@@ -414,7 +414,7 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s
        return 0;
 
 error:
-       kunmap_atomic(sdt, KM_USER0);
+       kunmap_atomic(sdt);
        sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u, app %4x\n",
                  __func__, virt, phys, be32_to_cpu(sdt->ref_tag),
                  be16_to_cpu(sdt->app_tag));
@@ -453,13 +453,13 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
                virt = bio->bi_integrity->bip_sector & 0xffffffff;
 
                bip_for_each_vec(iv, bio->bi_integrity, i) {
-                       sdt = kmap_atomic(iv->bv_page, KM_USER0)
+                       sdt = kmap_atomic(iv->bv_page)
                                + iv->bv_offset;
 
                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
 
                                if (sectors == 0) {
-                                       kunmap_atomic(sdt, KM_USER0);
+                                       kunmap_atomic(sdt);
                                        return;
                                }
 
@@ -474,7 +474,7 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
                                sectors--;
                        }
 
-                       kunmap_atomic(sdt, KM_USER0);
+                       kunmap_atomic(sdt);
                }
        }
 }