* [PATCH 8/9] sata_sil24.c conversion
@ 2006-06-29 16:10 Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2006-06-29 16:10 UTC (permalink / raw)
To: linux-ide; +Cc: Jeff Garzik, Tejun Heo
Convert the sata-sil24.c to the new scheme.
Signed-off-by: <petkov@math.uni-muenster.de>
--- libata-dev/drivers/scsi/sata_sil24.c.orig 2006-06-29 16:43:10.000000000 +0200
+++ libata-dev/drivers/scsi/sata_sil24.c 2006-06-29 16:52:28.000000000 +0200
@@ -535,10 +535,12 @@ static int sil24_softreset(struct ata_po
u32 mask, irq_stat;
const char *reason;
- DPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
if (ata_port_offline(ap)) {
- DPRINTK("PHY reports no device\n");
+ ata_port_printk(ap, ATA_MSG_VDEBUG,
+ "%s: PHY reports no device\n",
+ __FUNCTION__);
*class = ATA_DEV_NONE;
goto out;
}
@@ -578,11 +580,11 @@ static int sil24_softreset(struct ata_po
*class = ATA_DEV_NONE;
out:
- DPRINTK("EXIT, class=%u\n", *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, class=%u\n", __FUNCTION__, *class);
return 0;
err:
- ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "softreset failed (%s)\n", reason);
return -EIO;
}
@@ -629,7 +631,7 @@ static int sil24_hardreset(struct ata_po
return -EAGAIN;
err:
- ata_port_printk(ap, KERN_ERR, "hardreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "hardreset failed (%s)\n", reason);
return -EIO;
}
@@ -854,7 +856,7 @@ static inline void sil24_host_intr(struc
}
if (ata_ratelimit())
- ata_port_printk(ap, KERN_INFO, "spurious interrupt "
+ ata_port_printk(ap, ATA_MSG_INFO, "spurious interrupt "
"(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
slot_stat, ap->active_tag, ap->sactive);
}
___________________________________________________________
Gesendet von Yahoo! Mail - Jetzt mit 1GB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH 8/9] sata_sil24.c conversion
@ 2006-06-30 6:50 Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2006-06-30 6:50 UTC (permalink / raw)
To: linux-ide; +Cc: Jeff Garzik, Tejun Heo
Convert the sata-sil24.c to the new scheme.
Signed-off-by: <petkov@math.uni-muenster.de>
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index b5f8fa9..ec1a7f3 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -535,10 +535,12 @@ static int sil24_softreset(struct ata_po
u32 mask, irq_stat;
const char *reason;
- DPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
if (ata_port_offline(ap)) {
- DPRINTK("PHY reports no device\n");
+ ata_port_printk(ap, ATA_MSG_VDEBUG,
+ "%s: PHY reports no device\n",
+ __FUNCTION__);
*class = ATA_DEV_NONE;
goto out;
}
@@ -578,11 +580,11 @@ static int sil24_softreset(struct ata_po
*class = ATA_DEV_NONE;
out:
- DPRINTK("EXIT, class=%u\n", *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, class=%u\n", __FUNCTION__, *class);
return 0;
err:
- ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "softreset failed (%s)\n", reason);
return -EIO;
}
@@ -629,7 +631,7 @@ static int sil24_hardreset(struct ata_po
return -EAGAIN;
err:
- ata_port_printk(ap, KERN_ERR, "hardreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "hardreset failed (%s)\n", reason);
return -EIO;
}
@@ -854,7 +856,7 @@ static inline void sil24_host_intr(struc
}
if (ata_ratelimit())
- ata_port_printk(ap, KERN_INFO, "spurious interrupt "
+ ata_port_printk(ap, ATA_MSG_INFO, "spurious interrupt "
"(slot_stat 0x%x active_tag %d sactive 0x%x)\n",
slot_stat, ap->active_tag, ap->sactive);
}
___________________________________________________________
Gesendet von Yahoo! Mail - Jetzt mit 1GB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-30 6:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-29 16:10 [PATCH 8/9] sata_sil24.c conversion Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2006-06-30 6:50 Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox