libnvdimm: remove else after return in nsio_rw_bytes()

else after return is not needed.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
[djbw: removed some now unnecessary newlines]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c
index 4638b9ea52290fb5f037943d91a28c4f84f3f6a3..3376da1fb263ea31a1932c7b973550abdd18673e 100644 (file)
--- a/drivers/nvdimm/claim.c
+++ b/drivers/nvdimm/claim.c
@@ -242,29 +242,26 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
                if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align)))
                        return -EIO;
                return memcpy_from_pmem(buf, nsio->addr + offset, size);
-       } else {
-
-               if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {
-                       if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)) {
-                               long cleared;
-
-                               cleared = nvdimm_clear_poison(&ndns->dev,
-                                                             offset, size);
-                               if (cleared != size) {
-                                       size = cleared;
-                                       rc = -EIO;
-                               }
-
-                               badblocks_clear(&nsio->bb, sector,
-                                               cleared >> 9);
-                       } else
+       }
+
+       if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {
+               if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)) {
+                       long cleared;
+
+                       cleared = nvdimm_clear_poison(&ndns->dev, offset, size);
+                       if (cleared != size) {
+                               size = cleared;
                                rc = -EIO;
-               }
+                       }
 
-               memcpy_to_pmem(nsio->addr + offset, buf, size);
-               nvdimm_flush(to_nd_region(ndns->dev.parent));
+                       badblocks_clear(&nsio->bb, sector, cleared >> 9);
+               } else
+                       rc = -EIO;
        }
 
+       memcpy_to_pmem(nsio->addr + offset, buf, size);
+       nvdimm_flush(to_nd_region(ndns->dev.parent));
+
        return rc;
 }