From d37806dc37b42b05515849b0444f09f493cb4cba Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Sun, 4 Dec 2016 10:45:13 -0800 Subject: [PATCH] libnvdimm: remove else after return in nsio_rw_bytes() else after return is not needed. Signed-off-by: Fabian Frederick [djbw: removed some now unnecessary newlines] Signed-off-by: Dan Williams --- drivers/nvdimm/claim.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 4638b9ea5229..3376da1fb263 100644 --- 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; } -- 2.39.5