OSDN Git Service

NVMe: Fix checkpatch issues
authorKeith Busch <keith.busch@intel.com>
Thu, 18 Jul 2013 18:13:51 +0000 (12:13 -0600)
committerMatthew Wilcox <matthew.r.wilcox@intel.com>
Tue, 3 Sep 2013 20:32:26 +0000 (16:32 -0400)
Signed-off-by: Keith Busch <keith.busch@intel.com>
drivers/block/nvme-core.c

index 56d1fa4..f924413 100644 (file)
@@ -451,10 +451,8 @@ static void nvme_bio_pair_endio(struct bio *bio, int err)
 
        if (atomic_dec_and_test(&bp->cnt)) {
                bio_endio(bp->parent, bp->err);
-               if (bp->bv1)
-                       kfree(bp->bv1);
-               if (bp->bv2)
-                       kfree(bp->bv2);
+               kfree(bp->bv1);
+               kfree(bp->bv2);
                kfree(bp);
        }
 }
@@ -1348,7 +1346,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
        c.rw.appmask = cpu_to_le16(io.appmask);
 
        if (meta_len) {
-               meta_iod = nvme_map_user_pages(dev, io.opcode & 1, io.metadata, meta_len);
+               meta_iod = nvme_map_user_pages(dev, io.opcode & 1, io.metadata,
+                                                               meta_len);
                if (IS_ERR(meta_iod)) {
                        status = PTR_ERR(meta_iod);
                        meta_iod = NULL;