Subject: Re: [PATCH net-next-2.6] bnx2: avoid compiler warnings

From: "Michael Chan" <[email-masked]>
Date: Tue, 3 Nov 2009 10:01:34 -0800

On Tue, 2009-11-03 at 01:17 -0800, Eric Dumazet wrote:
> drivers/net/bnx2.c: In function ‘bnx2_enable_forced_2g5’:
> drivers/net/bnx2.c:1447: warning: ‘bmcr’ may be used uninitialized in this function
> drivers/net/bnx2.c: In function ‘bnx2_disable_forced_2g5’:
> drivers/net/bnx2.c:1482: warning: ‘bmcr’ may be used uninitialized in this function
> 
> One fix would be to have an initial value, but a plain return might be better.

I agree that plain return is better.  Thanks.

Acked-by: Michael Chan <[email-masked]>

> 
> Signed-off-by: Eric Dumazet <[email-masked]>
> ---
> 
> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
> index 08cddb6..539d23b 100644
> --- a/drivers/net/bnx2.c
> +++ b/drivers/net/bnx2.c
> @@ -1466,6 +1466,8 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)
>  	} else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
>  		bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
>  		bmcr |= BCM5708S_BMCR_FORCE_2500;
> +	} else {
> +		return;
>  	}
>  
>  	if (bp->autoneg & AUTONEG_SPEED) {
> @@ -1500,6 +1502,8 @@ bnx2_disable_forced_2g5(struct bnx2 *bp)
>  	} else if (CHIP_NUM(bp) == CHIP_NUM_5708) {
>  		bnx2_read_phy(bp, bp->mii_bmcr, &bmcr);
>  		bmcr &= ~BCM5708S_BMCR_FORCE_2500;
> +	} else {
> +		return;
>  	}
>  
>  	if (bp->autoneg & AUTONEG_SPEED)
>