[PATCH 0/3] staging: rdma: Remove unnecessary variables

[PATCH 0/3] staging: rdma: Remove unnecessary variables

[Amitoj Kaur Chawla]

This patchset removes unnecessary variables that can be replaced by a
single line of code.

Amitoj Kaur Chawla (3):
  staging: rdma: amso1100: Remove unnecessary variable
  staging: rdma: hfi1: Remove unnecessary variable
  staging: rdma: hfi1: chip: Remove unnecessary variables

 drivers/staging/rdma/amso1100/c2_rnic.c |  5 +----
 drivers/staging/rdma/hfi1/chip.c        | 22 ++++++----------------
 drivers/staging/rdma/hfi1/qsfp.c        |  5 ++---
 3 files changed, 9 insertions(+), 23 deletions(-)

-- 
1.9.1

[PATCH 1/3] staging: rdma: amso1100: Remove unnecessary variable

[Amitoj Kaur Chawla]

Drop unnecessary variable that can be replaced by single line of code.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rdma/amso1100/c2_rnic.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/rdma/amso1100/c2_rnic.c b/drivers/staging/rdma/amso1100/c2_rnic.c
index d3c0f77..5e65c6d 100644
--- a/drivers/staging/rdma/amso1100/c2_rnic.c
+++ b/drivers/staging/rdma/amso1100/c2_rnic.c
@@ -81,7 +81,6 @@
 static int c2_adapter_init(struct c2_dev *c2dev)
 {
 	struct c2wr_init_req wr;
-	int err;
 
 	memset(&wr, 0, sizeof(wr));
 	c2_wr_set_id(&wr, CCWR_INIT);
@@ -94,9 +93,7 @@ static int c2_adapter_init(struct c2_dev *c2dev)
 	wr.q2_host_msg_pool = cpu_to_be64(c2dev->aeq.host_dma);
 
 	/* Post the init message */
-	err = vq_send_wr(c2dev, (union c2wr *) & wr);
-
-	return err;
+	return vq_send_wr(c2dev, (union c2wr *) & wr);
 }
 
 /*
-- 
1.9.1

[PATCH 2/3] staging: rdma: hfi1: Remove unnecessary variable

[Amitoj Kaur Chawla]

Drop unnecessary variable that can be replaced by a single line of
code.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rdma/hfi1/qsfp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/qsfp.c b/drivers/staging/rdma/hfi1/qsfp.c
index 3138936..8d7c959 100644
--- a/drivers/staging/rdma/hfi1/qsfp.c
+++ b/drivers/staging/rdma/hfi1/qsfp.c
@@ -480,7 +480,7 @@ int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len)
 	u8 *cache = &ppd->qsfp_info.cache[0];
 	u8 bin_buff[QSFP_DUMP_CHUNK];
 	char lenstr[6];
-	int sofar, ret;
+	int sofar;
 	int bidx = 0;
 	u8 *atten = &cache[QSFP_ATTEN_OFFS];
 	u8 *vendor_oui = &cache[QSFP_VOUI_OFFS];
@@ -541,6 +541,5 @@ int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len)
 			bidx += QSFP_DUMP_CHUNK;
 		}
 	}
-	ret = sofar;
-	return ret;
+	return sofar;
 }
-- 
1.9.1

[PATCH 3/3] staging: rdma: hfi1: chip: Remove unnecessary variables

[Amitoj Kaur Chawla]

Dop unnecessary variables that can be replaced by a single line of
code.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
 drivers/staging/rdma/hfi1/chip.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index aa58e59..03c9d3e 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -1249,12 +1249,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;
-	}
+	if (dd->flags & HFI1_PRESENT)
+		return readq((void __iomem *)dd->kregbase + offset);
 	return -1;
 }
 
@@ -1307,7 +1303,6 @@ static u64 dev_access_u64_csr(const struct cntr_entry *entry, void *context,
 {
 	struct hfi1_devdata *dd = (struct hfi1_devdata *)context;
 
-	u64 val = 0;
 	u64 csr = entry->csr;
 
 	if (entry->flags & CNTR_VL) {
@@ -1319,8 +1314,7 @@ static u64 dev_access_u64_csr(const struct cntr_entry *entry, void *context,
 			return 0;
 	}
 
-	val = read_write_csr(dd, csr, mode, data);
-	return val;
+	return read_write_csr(dd, csr, mode, data);
 }
 
 static u64 dc_access_lcb_cntr(const struct cntr_entry *entry, void *context,
@@ -1361,7 +1355,6 @@ static u64 port_access_u64_csr(const struct cntr_entry *entry,
 			     void *context, int vl, int mode, u64 data)
 {
 	struct hfi1_pportdata *ppd = (struct hfi1_pportdata *)context;
-	u64 val;
 	u64 csr = entry->csr;
 
 	if (entry->flags & CNTR_VL) {
@@ -1372,8 +1365,7 @@ static u64 port_access_u64_csr(const struct cntr_entry *entry,
 		if (vl != CNTR_INVALID_VL)
 			return 0;
 	}
-	val = read_write_csr(ppd->dd, csr, mode, data);
-	return val;
+	return read_write_csr(ppd->dd, csr, mode, data);
 }
 
 /* Software defined */
@@ -10673,19 +10665,17 @@ static u16 delay_cycles(struct hfi1_pportdata *ppd, u32 desired_egress_rate,
 u64 create_pbc(struct hfi1_pportdata *ppd, u64 flags, int srate_mbs, u32 vl,
 	       u32 dw_len)
 {
-	u64 pbc, delay = 0;
+	u64 delay = 0;
 
 	if (unlikely(srate_mbs))
 		delay = delay_cycles(ppd, srate_mbs, dw_len);
 
-	pbc = flags
+	return flags
 		| (delay << PBC_STATIC_RATE_CONTROL_COUNT_SHIFT)
 		| ((u64)PBC_IHCRC_NONE << PBC_INSERT_HCRC_SHIFT)
 		| (vl & PBC_VL_MASK) << PBC_VL_SHIFT
 		| (dw_len & PBC_LENGTH_DWS_MASK)
 			<< PBC_LENGTH_DWS_SHIFT;
-
-	return pbc;
 }
 
 #define SBUS_THERMAL    0x4f
-- 
1.9.1