Received-SPF: pass (google.com: domain of bhaktipriya96@gmail.com designates 2607:f8b0:400e:c03::233 as permitted sender) client-ip=2607:f8b0:400e:c03::233;
Date: Mon, 22 Feb 2016 22:33:34 +0530
From: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
To: outreachy-kernel@googlegroups.com
Subject: [PATCH] staging: rdma: hfi1: Compress return logic
Message-ID: <20160222170333.GA26010@Karyakshetra>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)

Simplified function return by merging assignment and return into
one line.

Found with Coccinelle.

@@
expression e;
local idexpression ret;
@@
- ret =
+ return
e;
- return ret;

@@ type T; identifier x; @@
- T x;
... when != x

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
---
 drivers/staging/rdma/hfi1/user_pages.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/user_pages.c b/drivers/staging/rdma/hfi1/user_pages.c
index 692de65..8ebfe9e 100644
--- a/drivers/staging/rdma/hfi1/user_pages.c
+++ b/drivers/staging/rdma/hfi1/user_pages.c
@@ -61,11 +61,7 @@
 dma_addr_t hfi1_map_page(struct pci_dev *hwdev, struct page *page,
 			 unsigned long offset, size_t size, int direction)
 {
-	dma_addr_t phys;
-
-	phys = pci_map_page(hwdev, page, offset, size, direction);
-
-	return phys;
+	return pci_map_page(hwdev, page, offset, size, direction);
 }

 int hfi1_acquire_user_pages(unsigned long vaddr, size_t npages, bool writable,
--
2.1.4