Skip to contentSkip to conversation

ata: sata_sil.c check sil_scr_read for failure

RFC PATCH In review Jaswinder Singh Rajput 2 participants 2 messages Sep 12, 2009 – Sep 14, 2009 libata

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ata: sata_sil.c check sil_scr_read for failure

[This is untested]

By checking sil_scr_read, we can get rid of this compilation warning:

CC [M] drivers/ata/sata_sil.o
drivers/ata/sata_sil.c: In function ‘sil_host_intr’:
drivers/ata/sata_sil.c:442: warning: ‘serror’ may be used uninitialized in this function

---
 drivers/ata/sata_sil.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/ata/sata_sil.c +2 -1
index 3cb69d5..a908031 100644
@@ -445,7 +445,8 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
 		 * controllers continue to assert IRQ as long as
 		 * SError bits are pending.  Clear SError immediately.
 		 */
-		sil_scr_read(&ap->link, SCR_ERROR, &serror);
+		if (sil_scr_read(&ap->link, SCR_ERROR, &serror))
+			return;
 		sil_scr_write(&ap->link, SCR_ERROR, serror);
 
 		/* Sometimes spurious interrupts occur, double check
Signature · 1 line
1.6.4.2
#1 lore raw
Quoted 18 lines · Jaswinder Singh Rajput

[This is untested]

By checking sil_scr_read, we can get rid of this compilation warning:

CC [M] drivers/ata/sata_sil.o
drivers/ata/sata_sil.c: In function ‘sil_host_intr’:
drivers/ata/sata_sil.c:442: warning: ‘serror’ may be used uninitialized in this function

---
 drivers/ata/sata_sil.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/ata/sata_sil.c +0 -0
index 3cb69d5..a908031 100644

drivers/ata/sata_sil.c static void sil_host_intr(struct ata_port *ap, u32 bmdma2) · line 450

Quoted 7 lines
drivers/ata/sata_sil.c +2 -1
@@ -445,7 +445,8 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
 		 * controllers continue to assert IRQ as long as
 		 * SError bits are pending.  Clear SError immediately.
 		 */
-		sil_scr_read(&ap->link, SCR_ERROR, &serror);
+		if (sil_scr_read(&ap->link, SCR_ERROR, &serror))
+			return;
 		sil_scr_write(&ap->link, SCR_ERROR, serror);

Eh.... the driver knows the call wouldn't fail. I think uninitialized_var() would be more appropriate here.

Thanks.

Signature · 1 line
tejun