* [2.6 patch] drivers/net/cxgb3/xgmac.c: remove dead code
@ 2007-07-29 14:55 Adrian Bunk
2007-07-31 23:43 ` Divy Le Ray
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2007-07-29 14:55 UTC (permalink / raw)
To: Divy Le Ray, Jeff Garzik; +Cc: netdev, linux-kernel
This patch removes dead code ("tx_xcnt" can never be != 0 at this place)
spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/net/cxgb3/xgmac.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- linux-2.6.22-rc6-mm1/drivers/net/cxgb3/xgmac.c.old 2007-07-24 13:55:33.000000000 +0200
+++ linux-2.6.22-rc6-mm1/drivers/net/cxgb3/xgmac.c 2007-07-24 13:57:06.000000000 +0200
@@ -510,38 +510,35 @@ int t3b2_mac_watchdog_task(struct cmac *
if (tx_mcnt == mac->tx_mcnt) {
tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
A_XGM_TX_SPI4_SOP_EOP_CNT +
mac->offset)));
if (tx_xcnt == 0) {
t3_write_reg(adap, A_TP_PIO_ADDR,
A_TP_TX_DROP_CNT_CH0 + macidx(mac));
tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap,
A_TP_PIO_DATA)));
} else {
goto rxcheck;
}
} else {
mac->toggle_cnt = 0;
goto rxcheck;
}
- if (((tx_tcnt != mac->tx_tcnt) &&
- (tx_xcnt == 0) && (mac->tx_xcnt == 0)) ||
- ((mac->tx_mcnt == tx_mcnt) &&
- (tx_xcnt != 0) && (mac->tx_xcnt != 0))) {
+ if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0)) {
if (mac->toggle_cnt > 4) {
status = 2;
goto out;
} else {
status = 1;
goto out;
}
} else {
mac->toggle_cnt = 0;
goto rxcheck;
}
rxcheck:
if (rx_mcnt != mac->rx_mcnt)
rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
A_XGM_RX_SPI4_SOP_EOP_CNT +
mac->offset)));
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [2.6 patch] drivers/net/cxgb3/xgmac.c: remove dead code
2007-07-29 14:55 [2.6 patch] drivers/net/cxgb3/xgmac.c: remove dead code Adrian Bunk
@ 2007-07-31 23:43 ` Divy Le Ray
0 siblings, 0 replies; 2+ messages in thread
From: Divy Le Ray @ 2007-07-31 23:43 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Jeff Garzik, netdev, linux-kernel
Adrian Bunk wrote:
>
> This patch removes dead code ("tx_xcnt" can never be != 0 at this place)
> spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
Acked-by: Divy Le Ray <divy@chelsio.com>
>
>
> ---
>
> drivers/net/cxgb3/xgmac.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> --- linux-2.6.22-rc6-mm1/drivers/net/cxgb3/xgmac.c.old 2007-07-24
> 13:55:33.000000000 +0200
> +++ linux-2.6.22-rc6-mm1/drivers/net/cxgb3/xgmac.c 2007-07-24
> 13:57:06.000000000 +0200
> @@ -510,38 +510,35 @@ int t3b2_mac_watchdog_task(struct cmac *
> if (tx_mcnt == mac->tx_mcnt) {
> tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
>
> A_XGM_TX_SPI4_SOP_EOP_CNT +
> mac->offset)));
> if (tx_xcnt == 0) {
> t3_write_reg(adap, A_TP_PIO_ADDR,
> A_TP_TX_DROP_CNT_CH0 + macidx(mac));
> tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap,
> A_TP_PIO_DATA)));
> } else {
> goto rxcheck;
> }
> } else {
> mac->toggle_cnt = 0;
> goto rxcheck;
> }
>
> - if (((tx_tcnt != mac->tx_tcnt) &&
> - (tx_xcnt == 0) && (mac->tx_xcnt == 0)) ||
> - ((mac->tx_mcnt == tx_mcnt) &&
> - (tx_xcnt != 0) && (mac->tx_xcnt != 0))) {
> + if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0)) {
> if (mac->toggle_cnt > 4) {
> status = 2;
> goto out;
> } else {
> status = 1;
> goto out;
> }
> } else {
> mac->toggle_cnt = 0;
> goto rxcheck;
> }
>
> rxcheck:
> if (rx_mcnt != mac->rx_mcnt)
> rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,
>
> A_XGM_RX_SPI4_SOP_EOP_CNT +
> mac->offset)));
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-07-31 23:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-29 14:55 [2.6 patch] drivers/net/cxgb3/xgmac.c: remove dead code Adrian Bunk
2007-07-31 23:43 ` Divy Le Ray
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).