* [PATCH 2/9] ahci.c conversion
@ 2006-06-29 16:09 Borislav Petkov
2006-06-29 16:30 ` Tejun Heo
0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2006-06-29 16:09 UTC (permalink / raw)
To: linux-ide; +Cc: Jeff Garzik, Tejun Heo
This converts the relevant places of ahci.c to the new scheme.
Signed-off-by: <petkov@math.uni-muenster.de>
--- libata-dev/drivers/scsi/ahci.c.orig 2006-06-28 09:13:10.000000000 +0200
+++ libata-dev/drivers/scsi/ahci.c 2006-06-29 17:29:06.000000000 +0200
@@ -617,10 +617,10 @@ static int ahci_softreset(struct ata_por
u8 *fis;
int rc;
- 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_CMD, "PHY reports no device\n");
*class = ATA_DEV_NONE;
return 0;
}
@@ -702,13 +702,14 @@ static int ahci_softreset(struct ata_por
*class = ahci_dev_classify(ap);
}
- DPRINTK("EXIT, class=%u\n", *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, class=%u\n",
+ __FUNCTION__, *class);
return 0;
fail_restart:
ahci_start_engine(ap);
fail:
- ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "softreset failed (%s)\n", reason);
return rc;
}
@@ -719,7 +720,7 @@ static int ahci_hardreset(struct ata_por
struct ata_taskfile tf;
int rc;
- DPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
ahci_stop_engine(ap);
@@ -737,7 +738,8 @@ static int ahci_hardreset(struct ata_por
if (*class == ATA_DEV_UNKNOWN)
*class = ATA_DEV_NONE;
- DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, rc=%d, class=%u\n",
+ __FUNCTION__, rc, *class);
return rc;
}
@@ -779,9 +781,10 @@ static unsigned int ahci_fill_sg(struct
{
struct scatterlist *sg;
struct ahci_sg *ahci_sg;
+ struct ata_port *ap = qc->ap;
unsigned int n_sg = 0;
- VPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
/*
* Next, the S/G list.
@@ -950,7 +953,7 @@ static void ahci_host_intr(struct ata_po
}
if (ata_ratelimit())
- ata_port_printk(ap, KERN_INFO, "spurious interrupt "
+ ata_port_printk(ap, ATA_MSG_DRV, "spurious interrupt "
"(irq_stat 0x%x active_tag %d sactive 0x%x)\n",
status, ap->active_tag, ap->sactive);
}
___________________________________________________________
Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/9] ahci.c conversion
2006-06-29 16:09 [PATCH 2/9] ahci.c conversion Borislav Petkov
@ 2006-06-29 16:30 ` Tejun Heo
2006-06-29 17:00 ` Borislav Petkov
0 siblings, 1 reply; 4+ messages in thread
From: Tejun Heo @ 2006-06-29 16:30 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-ide, Jeff Garzik
Borislav Petkov wrote:
> This converts the relevant places of ahci.c to the new scheme.
>
> Signed-off-by: <petkov@math.uni-muenster.de>
>
> --- libata-dev/drivers/scsi/ahci.c.orig 2006-06-28 09:13:10.000000000 +0200
> +++ libata-dev/drivers/scsi/ahci.c 2006-06-29 17:29:06.000000000 +0200
> @@ -617,10 +617,10 @@ static int ahci_softreset(struct ata_por
> u8 *fis;
> int rc;
>
> - 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_CMD, "PHY reports no device\n");
Not really CMD, I think it should be ATA_MSG_DEBUG.
<--snip-->
> if (ata_ratelimit())
> - ata_port_printk(ap, KERN_INFO, "spurious interrupt "
> + ata_port_printk(ap, ATA_MSG_DRV, "spurious interrupt "
> "(irq_stat 0x%x active_tag %d sactive 0x%x)\n",
> status, ap->active_tag, ap->sactive);
I don't really understand why it should be DRV not INFO. Is this to
discern between core and LLD messages?
--
tejun
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/9] ahci.c conversion
2006-06-29 16:30 ` Tejun Heo
@ 2006-06-29 17:00 ` Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2006-06-29 17:00 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide, Jeff Garzik
On Fri, Jun 30, 2006 at 01:30:17AM +0900, Tejun Heo wrote:
> >--- libata-dev/drivers/scsi/ahci.c.orig 2006-06-28
> >09:13:10.000000000 +0200
> >+++ libata-dev/drivers/scsi/ahci.c 2006-06-29 17:29:06.000000000 +0200
> >@@ -617,10 +617,10 @@ static int ahci_softreset(struct ata_por
> > u8 *fis;
> > int rc;
> >
> >- 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_CMD, "PHY reports no device\n");
>
> Not really CMD, I think it should be ATA_MSG_DEBUG.
We already have VDEBUG, do we ATA_MSG_DEBUG too, and if so, what is going to be
the difference between VDEBUG and DEBUG? Pending what we have decided here, I'm
gonna correct all other cases with DEBUG.
>
> <--snip-->
> > if (ata_ratelimit())
> >- ata_port_printk(ap, KERN_INFO, "spurious interrupt "
> >+ ata_port_printk(ap, ATA_MSG_DRV, "spurious interrupt "
> > "(irq_stat 0x%x active_tag %d sactive
> > 0x%x)\n",
> > status, ap->active_tag, ap->sactive);
>
> I don't really understand why it should be DRV not INFO. Is this to
> discern between core and LLD messages?
right, this should be INFO.
Regards,
Boris.
___________________________________________________________
Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/9] ahci.c conversion
@ 2006-06-30 6:45 Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2006-06-30 6:45 UTC (permalink / raw)
To: linux-ide; +Cc: Jeff Garzik, Tejun Heo
This converts the relevant places of ahci.c to the new scheme.
Signed-off-by: <petkov@math.uni-muenster.de>
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f059467..facddbd 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -617,10 +617,10 @@ static int ahci_softreset(struct ata_por
u8 *fis;
int rc;
- 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_DEBUG, "PHY reports no device\n");
*class = ATA_DEV_NONE;
return 0;
}
@@ -702,13 +702,14 @@ static int ahci_softreset(struct ata_por
*class = ahci_dev_classify(ap);
}
- DPRINTK("EXIT, class=%u\n", *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, class=%u\n",
+ __FUNCTION__, *class);
return 0;
fail_restart:
ahci_start_engine(ap);
fail:
- ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);
+ ata_port_printk(ap, ATA_MSG_ERR, "softreset failed (%s)\n", reason);
return rc;
}
@@ -719,7 +720,7 @@ static int ahci_hardreset(struct ata_por
struct ata_taskfile tf;
int rc;
- DPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
ahci_stop_engine(ap);
@@ -737,7 +738,8 @@ static int ahci_hardreset(struct ata_por
if (*class == ATA_DEV_UNKNOWN)
*class = ATA_DEV_NONE;
- DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: EXIT, rc=%d, class=%u\n",
+ __FUNCTION__, rc, *class);
return rc;
}
@@ -779,9 +781,10 @@ static unsigned int ahci_fill_sg(struct
{
struct scatterlist *sg;
struct ahci_sg *ahci_sg;
+ struct ata_port *ap = qc->ap;
unsigned int n_sg = 0;
- VPRINTK("ENTER\n");
+ ata_port_printk(ap, ATA_MSG_TRACE, "%s: ENTER\n", __FUNCTION__);
/*
* Next, the S/G list.
@@ -950,7 +953,7 @@ static void ahci_host_intr(struct ata_po
}
if (ata_ratelimit())
- ata_port_printk(ap, KERN_INFO, "spurious interrupt "
+ ata_port_printk(ap, ATA_MSG_INFO, "spurious interrupt "
"(irq_stat 0x%x active_tag %d sactive 0x%x)\n",
status, 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] 4+ messages in thread
end of thread, other threads:[~2006-06-30 6:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-29 16:09 [PATCH 2/9] ahci.c conversion Borislav Petkov
2006-06-29 16:30 ` Tejun Heo
2006-06-29 17:00 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2006-06-30 6:45 Borislav Petkov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.