Skip to contentSkip to conversation

staging: slicoss: remove unused variables

PATCH In review Sudip Mukherjee 3 participants 6 messages Sep 4, 2015 – Sep 12, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: slicoss: remove unused variables

These variables were only assigned some values but they were never used.

---
 drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/staging/slicoss/slicoss.c +6 -21
index 8585970..1536ca0 100644
@@ -199,10 +199,8 @@ static void slic_mcast_set_mask(struct adapter *adapter)
 static void slic_timer_ping(ulong dev)
 {
 	struct adapter *adapter;
-	struct sliccard *card;
 
 	adapter = netdev_priv((struct net_device *)dev);
-	card = adapter->card;
 
 	adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
 	add_timer(&adapter->pingtimer);
@@ -1719,7 +1717,6 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
  */
 static void slic_link_event_handler(struct adapter *adapter)
 {
-	int status;
 	struct slic_shmem *pshmem;
 
 	if (adapter->state != ADAPT_UP) {
@@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
 	pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
 
 #if BITS_PER_LONG == 64
-	status = slic_upr_request(adapter,
-				  SLIC_UPR_RLSR,
-				  SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
-				  SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
-				  0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
+			 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
 #else
-	status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-		(u32) &pshmem->linkstatus,	/* no 4GB wrap guaranteed */
-				  0, 0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+			 0, 0, 0);
 #endif
 }
 
@@ -2078,8 +2073,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
 			adapter->error_interrupts++;
 			if (isr & ISR_RMISS) {
 				int count;
-				int pre_count;
-				int errors;
 
 				struct slic_rcvqueue *rcvq =
 					&adapter->rcvqueue;
@@ -2088,8 +2081,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
 
 				if (!rcvq->errors)
 					rcv_count = rcvq->count;
-				pre_count = rcvq->count;
-				errors = rcvq->errors;
 
 				while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
 					count = slic_rcvqueue_fill(adapter);
@@ -2650,9 +2641,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 	ushort calc_chksum;
 	struct slic_config_mac *pmac;
 	unsigned char fruformat;
-	unsigned char oemfruformat;
 	struct atk_fru *patkfru;
-	union oemfru *poemfru;
 	unsigned long flags;
 
 	/* Reset everything except PCI configuration space */
@@ -2742,8 +2731,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 			pmac = pOeeprom->MacInfo;
 			fruformat = pOeeprom->FruFormat;
 			patkfru = &pOeeprom->AtkFru;
-			oemfruformat = pOeeprom->OemFruFormat;
-			poemfru = &pOeeprom->OemFru;
 			macaddrs = 2;
 			/* Minor kludge for Oasis card
 			     get 2 MAC addresses from the
@@ -2757,8 +2744,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 			pmac = peeprom->u2.mac.MacInfo;
 			fruformat = peeprom->FruFormat;
 			patkfru = &peeprom->AtkFru;
-			oemfruformat = peeprom->OemFruFormat;
-			poemfru = &peeprom->OemFru;
 			break;
 		}
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 39 lines · Sudip Mukherjee

These variables were only assigned some values but they were never used.

---
 drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/staging/slicoss/slicoss.c +0 -8
index 8585970..1536ca0 100644
@@ -199,10 +199,8 @@ static void slic_mcast_set_mask(struct adapter *adapter)
 static void slic_timer_ping(ulong dev)
 {
        struct adapter *adapter;
-       struct sliccard *card;
 
        adapter = netdev_priv((struct net_device *)dev);
-       card = adapter->card;
 
        adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
        add_timer(&adapter->pingtimer);
@@ -1719,7 +1717,6 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
  */
 static void slic_link_event_handler(struct adapter *adapter)
 {
-       int status;
        struct slic_shmem *pshmem;
 
        if (adapter->state != ADAPT_UP) {
@@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
        pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
 
 #if BITS_PER_LONG == 64
-       status = slic_upr_request(adapter,
-                                 SLIC_UPR_RLSR,
-                                 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
-                                 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
-                                 0, 0);

drivers/staging/slicoss/slicoss.c static void slic_link_event_handler(struct adapter *adapter) · line 1736

Quoted 10 lines
drivers/staging/slicoss/slicoss.c +6 -3
+       slic_upr_request(adapter, SLIC_UPR_RLSR,
+                        SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
+                        SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
 #else
-       status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-               (u32) &pshmem->linkstatus,      /* no 4GB wrap guaranteed */
-                                 0, 0, 0);
+       slic_upr_request(adapter, SLIC_UPR_RLSR,
+                        (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+                        0, 0, 0);

Is status safe to ignore?

Quoted 57 lines
drivers/staging/slicoss/slicoss.c +0 -11
 #endif
 }
 
@@ -2078,8 +2073,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
                        adapter->error_interrupts++;
                        if (isr & ISR_RMISS) {
                                int count;
-                               int pre_count;
-                               int errors;
 
                                struct slic_rcvqueue *rcvq =
                                        &adapter->rcvqueue;
@@ -2088,8 +2081,6 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
 
                                if (!rcvq->errors)
                                        rcv_count = rcvq->count;
-                               pre_count = rcvq->count;
-                               errors = rcvq->errors;
 
                                while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
                                        count = slic_rcvqueue_fill(adapter);
@@ -2650,9 +2641,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
        ushort calc_chksum;
        struct slic_config_mac *pmac;
        unsigned char fruformat;
-       unsigned char oemfruformat;
        struct atk_fru *patkfru;
-       union oemfru *poemfru;
        unsigned long flags;
 
        /* Reset everything except PCI configuration space */
@@ -2742,8 +2731,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
                        pmac = pOeeprom->MacInfo;
                        fruformat = pOeeprom->FruFormat;
                        patkfru = &pOeeprom->AtkFru;
-                       oemfruformat = pOeeprom->OemFruFormat;
-                       poemfru = &pOeeprom->OemFru;
                        macaddrs = 2;
                        /* Minor kludge for Oasis card
                             get 2 MAC addresses from the
@@ -2757,8 +2744,6 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
                        pmac = peeprom->u2.mac.MacInfo;
                        fruformat = peeprom->FruFormat;
                        patkfru = &peeprom->AtkFru;
-                       oemfruformat = peeprom->OemFruFormat;
-                       poemfru = &peeprom->OemFru;
                        break;
                }
 
--

1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
Quoted 6 lines · David Matlack
Quoted 4 lines · Sudip Mukherjee

These variables were only assigned some values but they were never used.

---

<snip>

Quoted 8 lines

drivers/staging/slicoss/slicoss.c static void slic_link_event_handler(struct adapter *adapter) · line 1736

Quoted 6 lines
drivers/staging/slicoss/slicoss.c +3 -3
-       status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-               (u32) &pshmem->linkstatus,      /* no 4GB wrap guaranteed */
-                                 0, 0, 0);
+       slic_upr_request(adapter, SLIC_UPR_RLSR,
+                        (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+                        0, 0, 0);

Is status safe to ignore?

status can have two value either -ENOMEM or STATUS_PEMDING. Ideally we should have handled -ENOMEM.

regards
sudip

#3 lore raw
In reply to Sudip Mukherjee
Quoted 39 lines · Sudip Mukherjee

These variables were only assigned some values but they were never used.

---
 drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/staging/slicoss/slicoss.c +0 -8
index 8585970..1536ca0 100644
@@ -199,10 +199,8 @@ static void slic_mcast_set_mask(struct adapter *adapter)
 static void slic_timer_ping(ulong dev)
 {
 	struct adapter *adapter;
-	struct sliccard *card;
 
 	adapter = netdev_priv((struct net_device *)dev);
-	card = adapter->card;
 
 	adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
 	add_timer(&adapter->pingtimer);
@@ -1719,7 +1717,6 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
  */
 static void slic_link_event_handler(struct adapter *adapter)
 {
-	int status;
 	struct slic_shmem *pshmem;
 
 	if (adapter->state != ADAPT_UP) {
@@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
 	pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
 
 #if BITS_PER_LONG == 64
-	status = slic_upr_request(adapter,
-				  SLIC_UPR_RLSR,
-				  SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
-				  SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
-				  0, 0);

drivers/staging/slicoss/slicoss.c static void slic_link_event_handler(struct adapter *adapter) · line 1736

Quoted 10 lines
drivers/staging/slicoss/slicoss.c +6 -3
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
+			 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
 #else
-	status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-		(u32) &pshmem->linkstatus,	/* no 4GB wrap guaranteed */
-				  0, 0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+			 0, 0, 0);

Shouldn't we do something with status instead of just ignoring it?

thanks,

greg k-h

#4 lore raw
Quoted 12 lines · Greg Kroah-Hartman
Quoted 11 lines · Sudip Mukherjee

These variables were only assigned some values but they were never used.

---
 drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/staging/slicoss/slicoss.c +0 -0
index 8585970..1536ca0 100644

<snip>

Quoted 13 lines
Quoted 13 lines
drivers/staging/slicoss/slicoss.c +3 -5
@@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
 	pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
 
 #if BITS_PER_LONG == 64
-	status = slic_upr_request(adapter,
-				  SLIC_UPR_RLSR,
-				  SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
-				  SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
-				  0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
+			 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
 #else
Quoted 8 lines

drivers/staging/slicoss/slicoss.c static void slic_link_event_handler(struct adapter *adapter) · line 1736

Quoted 6 lines
drivers/staging/slicoss/slicoss.c +3 -3
-	status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-		(u32) &pshmem->linkstatus,	/* no 4GB wrap guaranteed */
-				  0, 0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+			 0, 0, 0);

Shouldn't we do something with status instead of just ignoring it?

I can think of 3 possibilities.
1) Ignore it as this is writing READ_LINK_STATUS command to the device asynchronously, and then writing UP configuration command. So if status is error here then the device will not be UP.

2) loop here with a delay until the call succeeds. (will be a very bad design, but there are some codes doing that). But this functions is also called from an ISR so we should not be doing that.

3) return the error code and do the error handling properly by clearing and releasing all resources acquired by the function which called it.

Which one will you suggest? I am sure you will say : 3. :)

regards
sudip

#5 lore raw
Quoted 40 lines · Sudip Mukherjee
Quoted 12 lines · Greg Kroah-Hartman
Quoted 11 lines · Sudip Mukherjee

These variables were only assigned some values but they were never used.

---
 drivers/staging/slicoss/slicoss.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/staging/slicoss/slicoss.c +0 -0
index 8585970..1536ca0 100644

<snip>

Quoted 13 lines
Quoted 13 lines
drivers/staging/slicoss/slicoss.c +3 -5
@@ -1730,15 +1727,13 @@ static void slic_link_event_handler(struct adapter *adapter)
 	pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
 
 #if BITS_PER_LONG == 64
-	status = slic_upr_request(adapter,
-				  SLIC_UPR_RLSR,
-				  SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
-				  SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
-				  0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
+			 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus), 0, 0);
 #else
Quoted 8 lines

drivers/staging/slicoss/slicoss.c static void slic_link_event_handler(struct adapter *adapter) · line 1736

Quoted 6 lines
drivers/staging/slicoss/slicoss.c +3 -3
-	status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-		(u32) &pshmem->linkstatus,	/* no 4GB wrap guaranteed */
-				  0, 0, 0);
+	slic_upr_request(adapter, SLIC_UPR_RLSR,
+			 (u32)&pshmem->linkstatus, /* no 4GB wrap guaranteed */
+			 0, 0, 0);

Shouldn't we do something with status instead of just ignoring it?

I can think of 3 possibilities.
1) Ignore it as this is writing READ_LINK_STATUS command to the device asynchronously, and then writing UP configuration command. So if status is error here then the device will not be UP.

Quoted 8 lines

2) loop here with a delay until the call succeeds. (will be a very bad design, but there are some codes doing that). But this functions is also called from an ISR so we should not be doing that.

3) return the error code and do the error handling properly by clearing and releasing all resources acquired by the function which called it.

Which one will you suggest? I am sure you will say : 3. :)

I don't know why you even had to ask, of course 3 is the correct thing :)