Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752295AbcLCSxm (ORCPT ); Sat, 3 Dec 2016 13:53:42 -0500 Received: from mailrelay104.isp.belgacom.be ([195.238.20.131]:23174 "EHLO mailrelay104.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750749AbcLCSxk (ORCPT ); Sat, 3 Dec 2016 13:53:40 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2A9BwDlE0NY/9JLtVtdHQEFAQsBgzgBA?= =?us-ascii?q?QEBAR+BYKR3AZJHgg+CCIYigh5BEwECAQEBAQEBAWIohRYvI09LJBOIc68pPYt?= =?us-ascii?q?jhj6PBAWIYpIEkRcCkDs9DJFGIQMygRmDCgGBBYFGPTSKAAEBAQ?= X-IPAS-Result: =?us-ascii?q?A2A9BwDlE0NY/9JLtVtdHQEFAQsBgzgBAQEBAR+BYKR3AZJ?= =?us-ascii?q?Hgg+CCIYigh5BEwECAQEBAQEBAWIohRYvI09LJBOIc68pPYtjhj6PBAWIYpIEk?= =?us-ascii?q?RcCkDs9DJFGIQMygRmDCgGBBYFGPTSKAAEBAQ?= From: Fabian Frederick To: Dan Williams Cc: linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH V2 1/3 libnvdimm-pending] libnvdimm: remove else after return in nsio_rw_bytes() Date: Sat, 3 Dec 2016 19:53:32 +0100 Message-Id: <1480791212-21347-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1609 Lines: 63 else after return is not needed. Signed-off-by: Fabian Frederick --- V2: -applied on top of libnvdimm-pending drivers/nvdimm/claim.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 4638b9e..75c36c3 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -242,29 +242,28 @@ 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.7.4