From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750876AbWCIXGx (ORCPT ); Thu, 9 Mar 2006 18:06:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750951AbWCIXGw (ORCPT ); Thu, 9 Mar 2006 18:06:52 -0500 Received: from mailout.stusta.mhn.de ([141.84.69.5]:12554 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1750784AbWCIXGv (ORCPT ); Thu, 9 Mar 2006 18:06:51 -0500 Date: Fri, 10 Mar 2006 00:06:50 +0100 From: Adrian Bunk To: jgarzik@pobox.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [2.6 patch] tg3.c:tg3_bus_string(): remove dead code Message-ID: <20060309230650.GJ21864@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060126 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The Coverity checker spotted this dead code (note that (clock_ctrl == 7) is already handled above). Signed-off-by: Adrian Bunk --- 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;