netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [2.6 patch] tg3.c:tg3_bus_string(): remove dead code
@ 2006-03-09 23:06 Adrian Bunk
  2006-03-09 23:09 ` David S. Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2006-03-09 23:06 UTC (permalink / raw)
  To: jgarzik; +Cc: netdev, linux-kernel

The Coverity checker spotted this dead code (note that (clock_ctrl == 7) 
is already handled above).


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.16-rc5-mm3-full/drivers/net/tg3.c.old	2006-03-09 23:25:25.000000000 +0100
+++ linux-2.6.16-rc5-mm3-full/drivers/net/tg3.c	2006-03-09 23:25:39.000000000 +0100
@@ -10596,26 +10596,24 @@ static char * __devinit tg3_bus_string(s
 		if ((clock_ctrl == 7) ||
 		    ((tr32(GRC_MISC_CFG) & GRC_MISC_CFG_BOARD_ID_MASK) ==
 		     GRC_MISC_CFG_BOARD_ID_5704CIOBE))
 			strcat(str, "133MHz");
 		else if (clock_ctrl == 0)
 			strcat(str, "33MHz");
 		else if (clock_ctrl == 2)
 			strcat(str, "50MHz");
 		else if (clock_ctrl == 4)
 			strcat(str, "66MHz");
 		else if (clock_ctrl == 6)
 			strcat(str, "100MHz");
-		else if (clock_ctrl == 7)
-			strcat(str, "133MHz");
 	} else {
 		strcpy(str, "PCI:");
 		if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED)
 			strcat(str, "66MHz");
 		else
 			strcat(str, "33MHz");
 	}
 	if (tp->tg3_flags & TG3_FLAG_PCI_32BIT)
 		strcat(str, ":32-bit");
 	else
 		strcat(str, ":64-bit");
 	return str;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [2.6 patch] tg3.c:tg3_bus_string(): remove dead code
  2006-03-09 23:06 [2.6 patch] tg3.c:tg3_bus_string(): remove dead code Adrian Bunk
@ 2006-03-09 23:09 ` David S. Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2006-03-09 23:09 UTC (permalink / raw)
  To: bunk; +Cc: jgarzik, netdev, linux-kernel

From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 10 Mar 2006 00:06:50 +0100

> The Coverity checker spotted this dead code (note that (clock_ctrl == 7) 
> is already handled above).
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Applied, thanks Adrian.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-03-09 23:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-03-09 23:06 [2.6 patch] tg3.c:tg3_bus_string(): remove dead code Adrian Bunk
2006-03-09 23:09 ` David S. Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).