Re: [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code

[David Woodhouse <david.woodhouse@intel.com>]

On Tue, 2009-11-17 at 14:46 -0800, akpm@linux-foundation.org wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> drivers/atm/solos-pci.c: In function 'flash_upgrade':
> drivers/atm/solos-pci.c:528: warning: 'fw_name' may be used uninitialized in this function
> 
> Cc: Chas Williams <chas@cmf.nrl.navy.mil>
> Cc: Nathan Williams <nathan@traverse.com.au>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Acked-By: David Woodhouse <David.Woodhouse@intel.com>

> ---
> 
>  drivers/atm/solos-pci.c |   29 ++++++++++++++++-------------
>  1 file changed, 16 insertions(+), 13 deletions(-)
> 
> diff -puN drivers/atm/solos-pci.c~drivers-atm-solos-pcic-fix-warning-bug-clean-up-code drivers/atm/solos-pci.c
> --- a/drivers/atm/solos-pci.c~drivers-atm-solos-pcic-fix-warning-bug-clean-up-code
> +++ a/drivers/atm/solos-pci.c
> @@ -531,34 +531,37 @@ static int flash_upgrade(struct solos_ca
>  	int numblocks = 0;
>  	int offset;
>  
> -	if (chip == 0) {
> +	switch (chip) {
> +	case 0:
>  		fw_name = "solos-FPGA.bin";
>  		blocksize = FPGA_BLOCK;
> -	} 
> -	
> -	if (chip == 1) {
> +		break;
> +	case 1:
>  		fw_name = "solos-Firmware.bin";
>  		blocksize = SOLOS_BLOCK;
> -	}
> -	
> -	if (chip == 2){
> +		break;
> +	case 2:
>  		if (card->fpga_version > LEGACY_BUFFERS){
>  			fw_name = "solos-db-FPGA.bin";
>  			blocksize = FPGA_BLOCK;
>  		} else {
> -			dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
> +			dev_info(&card->dev->dev, "FPGA version doesn't support"
> +					" daughter board upgrades\n");
>  			return -EPERM;
>  		}
> -	}
> -	
> -	if (chip == 3){
> +		break;
> +	case 3:
>  		if (card->fpga_version > LEGACY_BUFFERS){
>  			fw_name = "solos-Firmware.bin";
>  			blocksize = SOLOS_BLOCK;
>  		} else {
> -		dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
> -		return -EPERM;
> +			dev_info(&card->dev->dev, "FPGA version doesn't support"
> +					" daughter board upgrades\n");
> +			return -EPERM;
>  		}
> +		break;
> +	default:
> +		return -ENODEV;
>  	}
>  
>  	if (request_firmware(&fw, fw_name, &card->dev->dev))
> _



-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation