From: Bhaktipriya Shridhar Date: Thu, 25 Feb 2016 11:52:11 +0000 (+0530) Subject: staging: rdma: hfi1: Remove useless return variables X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d210eef1b31b02ebec37a2ced6e73a1f94aacf1;p=linux-beck.git staging: rdma: hfi1: Remove useless return variables This patch removes unnecessary return variables and compresses the return logic. The coccinelle script that finds and fixes this issue is: @@ type T; identifier i,f; constant C; @@ - T i; ...when != i when strict ( return -C; | - i = + return f(...); - return i; ) Signed-off-by: Bhaktipriya Shridhar Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c index 02ba78ff5ca0..46a1830b509b 100644 --- a/drivers/staging/rdma/hfi1/chip.c +++ b/drivers/staging/rdma/hfi1/chip.c @@ -1250,11 +1250,8 @@ CNTR_ELEM(#name, \ u64 read_csr(const struct hfi1_devdata *dd, u32 offset) { - u64 val; - if (dd->flags & HFI1_PRESENT) { - val = readq((void __iomem *)dd->kregbase + offset); - return val; + return readq((void __iomem *)dd->kregbase + offset); } return -1; }