Skip to contentSkip to conversation

staging: qlge: remove unneeded variables

PATCH In review Payal Kshirsagar 2 participants 6 messages Mar 12, 2020 – Mar 15, 2020 Staging

lore
Share & tools
lore
#0 lore raw

v2 cover staging: qlge: remove unneeded variables

Remove unneeded temporary local variables from the files of drivers/staging/qlge directory.

Payal Kshirsagar (4):
staging: qlge: qlge_main.c: remove an unneeded variable
staging: qlge: qlge_mpi.c: remove an unneeded variable
staging: qlge: qlge_dbg.c: remove an unneeded variable
staging: qlge: qlge_ethtool.c: remove an unneeded variable

 drivers/staging/qlge/qlge_dbg.c     | 4 +---
 drivers/staging/qlge/qlge_ethtool.c | 4 +---
 drivers/staging/qlge/qlge_main.c    | 5 +----
 drivers/staging/qlge/qlge_mpi.c     | 5 +----
 4 files changed, 4 insertions(+), 14 delet23yjions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/4 staging: qlge: qlge_main.c: remove an unneeded variable

Remove unneeded temporary local variable, cleanup suggested by coccinelle.

---
v2: Nothing has changed.

 drivers/staging/qlge/qlge_main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/qlge/qlge_main.c +1 -4
index c712e1af90de..057034319e4e 100644
@@ -3905,14 +3905,11 @@ static void ql_release_adapter_resources(struct ql_adapter *qdev)
 
 static int ql_get_adapter_resources(struct ql_adapter *qdev)
 {
-	int status = 0;
-
 	if (ql_alloc_mem_resources(qdev)) {
 		netif_err(qdev, ifup, qdev->ndev, "Unable to  allocate memory.\n");
 		return -ENOMEM;
 	}
-	status = ql_request_irq(qdev);
-	return status;
+	return ql_request_irq(qdev);
 }
 
 static int qlge_close(struct net_device *ndev)
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/4 staging: qlge: qlge_mpi.c: remove an unneeded variable

In reply to Payal Kshirsagar

Remove unneeded temporary local variable, cleanup suggested by coccinelle.

---
v2: Nothing has changed.

 drivers/staging/qlge/qlge_mpi.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/qlge/qlge_mpi.c +1 -4
index 22ebd6cb8525..60c08d9cc034 100644
@@ -90,10 +90,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data)
 
 int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)
 {
-	int status;
-
-	status = ql_write_mpi_reg(qdev, 0x00001010, 1);
-	return status;
+	return ql_write_mpi_reg(qdev, 0x00001010, 1);
 }
 
 /* Determine if we are in charge of the firwmare. If
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 3/4 staging: qlge: qlge_dbg.c: remove an unneeded variable

In reply to Payal Kshirsagar

Remove unneeded temporary local variable, cleanup suggested by coccinelle.

---
v2: Keep newline as is for readability(Stefano Brivio).

 drivers/staging/qlge/qlge_dbg.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/qlge/qlge_dbg.c +1 -3
index 670361873d1d..cf753b8a6442 100644
@@ -29,15 +29,13 @@ static int ql_write_other_func_reg(struct ql_adapter *qdev,
 				   u32 reg, u32 reg_val)
 {
 	u32 register_to_read;
-	int status = 0;
 
 	register_to_read = MPI_NIC_REG_BLOCK
 				| MPI_NIC_READ
 				| (qdev->alt_func << MPI_NIC_FUNCTION_SHIFT)
 				| reg;
-	status = ql_write_mpi_reg(qdev, register_to_read, reg_val);
 
-	return status;
+	return ql_write_mpi_reg(qdev, register_to_read, reg_val);
 }
 
 static int ql_wait_other_func_reg_rdy(struct ql_adapter *qdev, u32 reg,
Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 4/4 staging: qlge: qlge_ethtool.c: remove an unneeded variable

In reply to Payal Kshirsagar

Remove unneeded temporary local variable, cleanup suggested by coccinelle.

---
v2: Keep newline as is for readability(Stefano Brivio).

 drivers/staging/qlge/qlge_ethtool.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/qlge/qlge_ethtool.c +1 -3
index 592ca7edfc44..441ac08d14d2 100644
@@ -692,7 +692,6 @@ static int ql_set_pauseparam(struct net_device *netdev,
 			     struct ethtool_pauseparam *pause)
 {
 	struct ql_adapter *qdev = netdev_priv(netdev);
-	int status = 0;
 
 	if ((pause->rx_pause) && (pause->tx_pause))
 		qdev->link_config |= CFG_PAUSE_STD;
@@ -701,8 +700,7 @@ static int ql_set_pauseparam(struct net_device *netdev,
 	else
 		return -EINVAL;
 
-	status = ql_mb_set_port_cfg(qdev);
-	return status;
+	return ql_mb_set_port_cfg(qdev);
 }
 
 static u32 ql_get_msglevel(struct net_device *ndev)
Signature · 1 line
2.17.1
Reviewed-by on the v2 series
#5 lore raw
In reply to Payal Kshirsagar
Quoted 7 lines · On Fri, 13 Mar 2020 00:36:20 +0530 Payal Kshirsagar…

Remove unneeded temporary local variables from the files of drivers/staging/qlge directory.

Payal Kshirsagar (4):
staging: qlge: qlge_main.c: remove an unneeded variable
staging: qlge: qlge_mpi.c: remove an unneeded variable
staging: qlge: qlge_dbg.c: remove an unneeded variable
staging: qlge: qlge_ethtool.c: remove an unneeded variable

For the series,

Signature · 1 line
Stefano