* [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code
@ 2009-11-17 22:46 akpm
2009-11-17 22:55 ` David Woodhouse
0 siblings, 1 reply; 3+ messages in thread
From: akpm @ 2009-11-17 22:46 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, David.Woodhouse, chas, nathan
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: David Woodhouse <David.Woodhouse@intel.com>
Cc: Nathan Williams <nathan@traverse.com.au>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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))
_
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code
2009-11-17 22:46 [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code akpm
@ 2009-11-17 22:55 ` David Woodhouse
2009-11-18 13:07 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: David Woodhouse @ 2009-11-17 22:55 UTC (permalink / raw)
To: akpm@linux-foundation.org
Cc: davem@davemloft.net, netdev@vger.kernel.org,
chas@cmf.nrl.navy.mil, nathan@traverse.com.au
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code
2009-11-17 22:55 ` David Woodhouse
@ 2009-11-18 13:07 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-11-18 13:07 UTC (permalink / raw)
To: david.woodhouse; +Cc: akpm, netdev, chas, nathan
From: David Woodhouse <david.woodhouse@intel.com>
Date: Tue, 17 Nov 2009 22:55:55 +0000
> 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>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-18 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-17 22:46 [patch 1/1] drivers/atm/solos-pci.c: fix warning/bug, clean up code akpm
2009-11-17 22:55 ` David Woodhouse
2009-11-18 13:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox