nvmet: configfs code cleanup
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Sun, 26 Jan 2020 20:35:44 +0000 (12:35 -0800)
committerKeith Busch <kbusch@kernel.org>
Wed, 4 Mar 2020 17:09:08 +0000 (09:09 -0800)
This is a pure code cleanup patch which does not change any
functionality. This patch removes the extra lines, get rid of
else which is duplicate for return.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/target/configfs.c

index 98613a45bd3b408e343b8e89f9605475f1cb47b9..403508a52e17f1637e8f037ab69400fe2cabc947 100644 (file)
@@ -395,14 +395,12 @@ static ssize_t nvmet_ns_device_uuid_store(struct config_item *item,
        struct nvmet_subsys *subsys = ns->subsys;
        int ret = 0;
 
-
        mutex_lock(&subsys->lock);
        if (ns->enabled) {
                ret = -EBUSY;
                goto out_unlock;
        }
 
-
        if (uuid_parse(page, &ns->uuid))
                ret = -EINVAL;
 
@@ -815,10 +813,10 @@ static ssize_t nvmet_subsys_attr_version_show(struct config_item *item,
                                (int)NVME_MAJOR(subsys->ver),
                                (int)NVME_MINOR(subsys->ver),
                                (int)NVME_TERTIARY(subsys->ver));
-       else
-               return snprintf(page, PAGE_SIZE, "%d.%d\n",
-                               (int)NVME_MAJOR(subsys->ver),
-                               (int)NVME_MINOR(subsys->ver));
+
+       return snprintf(page, PAGE_SIZE, "%d.%d\n",
+                       (int)NVME_MAJOR(subsys->ver),
+                       (int)NVME_MINOR(subsys->ver));
 }
 
 static ssize_t nvmet_subsys_attr_version_store(struct config_item *item,
@@ -828,7 +826,6 @@ static ssize_t nvmet_subsys_attr_version_store(struct config_item *item,
        int major, minor, tertiary = 0;
        int ret;
 
-
        ret = sscanf(page, "%d.%d.%d\n", &major, &minor, &tertiary);
        if (ret != 2 && ret != 3)
                return -EINVAL;