bluetooth: btmrvl_sdio: silence warning

PATCH In review Kulikov Vasiliy 3 participants 3 messages Jul 5, 2010 – Jul 8, 2010

Subsystems (2)

Bluetooth drivers Kernel janitors

lore

Share & tools

lore

Kulikov Vasiliy

author

2010-07-05 08:01 UTC #0 lore raw

PATCH 1/1 bluetooth: btmrvl_sdio: silence warning

Clone checking of ret to simplify the code.

This patch silences a compiler warning:
drivers/bluetooth/btmrvl_sdio.c: In function ‘btmrvl_sdio_verify_fw_download’:
drivers/bluetooth/btmrvl_sdio.c:80: warning: ‘fws1’ may be used uninitialized in this function drivers/bluetooth/btmrvl_sdio.c:80: note: ‘fws1’ was declared here

Signed-off-by Kulikov Vasiliy <[email protected]>

---
 drivers/bluetooth/btmrvl_sdio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/bluetooth/btmrvl_sdio.c +3 -3

index df0773e..47f0f91 100644
@@ -83,10 +83,10 @@ static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat)
 	*dat = 0;
 
 	fws0 = sdio_readb(card->func, CARD_FW_STATUS0_REG, &ret);
+	if (ret)
+		return -EIO;
 
-	if (!ret)
-		fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
-
+	fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
 	if (ret)
 		return -EIO;

Signature · 1 line

1.7.0.4

Dan Carpenter

Reviewed-by on v1 1/1

2010-07-05 09:24 UTC #1 lore raw

Quoted 17 lines · Kulikov Vasiliy

Clone checking of ret to simplify the code.
This patch silences a compiler warning:
drivers/bluetooth/btmrvl_sdio.c: In function ‘btmrvl_sdio_verify_fw_download’:
drivers/bluetooth/btmrvl_sdio.c:80: warning: ‘fws1’ may be used uninitialized in this function drivers/bluetooth/btmrvl_sdio.c:80: note: ‘fws1’ was declared here
Signed-off-by Kulikov Vasiliy <[email protected]>
---
 drivers/bluetooth/btmrvl_sdio.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/bluetooth/btmrvl_sdio.c +0 -0
index df0773e..47f0f91 100644

drivers/bluetooth/btmrvl_sdio.c static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat) · line 87

Quoted 5 lines

drivers/bluetooth/btmrvl_sdio.c +2 -0

@@ -83,10 +83,10 @@ static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat)
 	*dat = 0;
 
 	fws0 = sdio_readb(card->func, CARD_FW_STATUS0_REG, &ret);
+	if (ret)
+		return -EIO;

Normally it would be better to just "return ret;" here. But the caller doesn't use the return code so it doesn't really matter...

Reviewed-by Dan Carpenter <[email protected]>

regards,
dan carpenter

Quoted 8 lines

drivers/bluetooth/btmrvl_sdio.c +1 -3

-	if (!ret)
-		fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
-
+	fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
 	if (ret)
 		return -EIO;

Marcel Holtmann

maintainer

2010-07-08 21:02 UTC #2 lore raw

In reply to Kulikov Vasiliy

Hi Kulikov,

Quoted 8 lines

Clone checking of ret to simplify the code.
This patch silences a compiler warning:
drivers/bluetooth/btmrvl_sdio.c: In function ‘btmrvl_sdio_verify_fw_download’:
drivers/bluetooth/btmrvl_sdio.c:80: warning: ‘fws1’ may be used uninitialized in this function drivers/bluetooth/btmrvl_sdio.c:80: note: ‘fws1’ was declared here
Signed-off-by Kulikov Vasiliy <[email protected]>

patch has been applied to bluetooth-next-2.6 tree. Thanks.

Regards

Marcel