| Message ID | 20211208163255.114660-20-hare@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | libata: rework logging, take II | expand |
On 2021/12/09 1:32, Hannes Reinecke wrote: > The information is now logged with tracepoints, so the DPRINTK() > calls can be dropped. > > Signed-off-by: Hannes Reinecke <hare@suse.de> > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> squash this one in the previous patch ? > --- > drivers/ata/libata-eh.c | 12 ------------ > drivers/ata/libata-pmp.c | 8 -------- > drivers/ata/libata-sata.c | 3 --- > 3 files changed, 23 deletions(-) > > diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c > index 2a25be588e14..a0fd38260f48 100644 > --- a/drivers/ata/libata-eh.c > +++ b/drivers/ata/libata-eh.c > @@ -533,8 +533,6 @@ void ata_scsi_error(struct Scsi_Host *host) > unsigned long flags; > LIST_HEAD(eh_work_q); > > - DPRINTK("ENTER\n"); > - > spin_lock_irqsave(host->host_lock, flags); > list_splice_init(&host->eh_cmd_q, &eh_work_q); > spin_unlock_irqrestore(host->host_lock, flags); > @@ -548,7 +546,6 @@ void ata_scsi_error(struct Scsi_Host *host) > /* finish or retry handled scmd's and clean up */ > WARN_ON(!list_empty(&eh_work_q)); > > - DPRINTK("EXIT\n"); > } > > /** > @@ -1932,8 +1929,6 @@ static void ata_eh_link_autopsy(struct ata_link *link) > u32 serror; > int rc; > > - DPRINTK("ENTER\n"); > - > if (ehc->i.flags & ATA_EHI_NO_AUTOPSY) > return; > > @@ -2040,7 +2035,6 @@ static void ata_eh_link_autopsy(struct ata_link *link) > ehc->i.action |= ata_eh_speed_down(dev, eflags, all_err_mask); > trace_ata_eh_link_autopsy(dev, ehc->i.action, all_err_mask); > } > - DPRINTK("EXIT\n"); > } > > /** > @@ -2940,8 +2934,6 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, > unsigned long flags; > int rc = 0; > > - DPRINTK("ENTER\n"); > - > /* For PATA drive side cable detection to work, IDENTIFY must > * be done backwards such that PDIAG- is released by the slave > * device before the master device is identified. > @@ -3055,7 +3047,6 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, > > err: > *r_failed_dev = dev; > - DPRINTK("EXIT rc=%d\n", rc); > return rc; > } > > @@ -3570,8 +3561,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, > int rc, nr_fails; > unsigned long flags, deadline; > > - DPRINTK("ENTER\n"); > - > /* prep for recovery */ > ata_for_each_link(link, ap, EDGE) { > struct ata_eh_context *ehc = &link->eh_context; > @@ -3779,7 +3768,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, > if (rc && r_failed_link) > *r_failed_link = link; > > - DPRINTK("EXIT, rc=%d\n", rc); > return rc; > } > > diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c > index ba7be3f38617..e2e9cbd405fa 100644 > --- a/drivers/ata/libata-pmp.c > +++ b/drivers/ata/libata-pmp.c > @@ -652,8 +652,6 @@ static int sata_pmp_revalidate(struct ata_device *dev, unsigned int new_class) > u32 *gscr = (void *)ap->sector_buf; > int rc; > > - DPRINTK("ENTER\n"); > - > ata_eh_about_to_do(link, NULL, ATA_EH_REVALIDATE); > > if (!ata_dev_enabled(dev)) { > @@ -686,12 +684,10 @@ static int sata_pmp_revalidate(struct ata_device *dev, unsigned int new_class) > > ata_eh_done(link, NULL, ATA_EH_REVALIDATE); > > - DPRINTK("EXIT, rc=0\n"); > return 0; > > fail: > ata_dev_err(dev, "PMP revalidation failed (errno=%d)\n", rc); > - DPRINTK("EXIT, rc=%d\n", rc); > return rc; > } > > @@ -759,8 +755,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, > int detach = 0, rc = 0; > int reval_failed = 0; > > - DPRINTK("ENTER\n"); > - > if (dev->flags & ATA_DFLAG_DETACH) { > detach = 1; > rc = -ENODEV; > @@ -828,7 +822,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, > /* okay, PMP resurrected */ > ehc->i.flags = 0; > > - DPRINTK("EXIT, rc=0\n"); > return 0; > > fail: > @@ -838,7 +831,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, > else > ata_dev_disable(dev); > > - DPRINTK("EXIT, rc=%d\n", rc); > return rc; > } > > diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c > index 4e88597aa9df..7b72c68bc9f7 100644 > --- a/drivers/ata/libata-sata.c > +++ b/drivers/ata/libata-sata.c > @@ -533,8 +533,6 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, > u32 scontrol; > int rc; > > - DPRINTK("ENTER\n"); > - > if (online) > *online = false; > > @@ -610,7 +608,6 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, > *online = false; > ata_link_err(link, "COMRESET failed (errno=%d)\n", rc); > } > - DPRINTK("EXIT, rc=%d\n", rc); > return rc; > } > EXPORT_SYMBOL_GPL(sata_link_hardreset); >
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 2a25be588e14..a0fd38260f48 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -533,8 +533,6 @@ void ata_scsi_error(struct Scsi_Host *host) unsigned long flags; LIST_HEAD(eh_work_q); - DPRINTK("ENTER\n"); - spin_lock_irqsave(host->host_lock, flags); list_splice_init(&host->eh_cmd_q, &eh_work_q); spin_unlock_irqrestore(host->host_lock, flags); @@ -548,7 +546,6 @@ void ata_scsi_error(struct Scsi_Host *host) /* finish or retry handled scmd's and clean up */ WARN_ON(!list_empty(&eh_work_q)); - DPRINTK("EXIT\n"); } /** @@ -1932,8 +1929,6 @@ static void ata_eh_link_autopsy(struct ata_link *link) u32 serror; int rc; - DPRINTK("ENTER\n"); - if (ehc->i.flags & ATA_EHI_NO_AUTOPSY) return; @@ -2040,7 +2035,6 @@ static void ata_eh_link_autopsy(struct ata_link *link) ehc->i.action |= ata_eh_speed_down(dev, eflags, all_err_mask); trace_ata_eh_link_autopsy(dev, ehc->i.action, all_err_mask); } - DPRINTK("EXIT\n"); } /** @@ -2940,8 +2934,6 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, unsigned long flags; int rc = 0; - DPRINTK("ENTER\n"); - /* For PATA drive side cable detection to work, IDENTIFY must * be done backwards such that PDIAG- is released by the slave * device before the master device is identified. @@ -3055,7 +3047,6 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, err: *r_failed_dev = dev; - DPRINTK("EXIT rc=%d\n", rc); return rc; } @@ -3570,8 +3561,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, int rc, nr_fails; unsigned long flags, deadline; - DPRINTK("ENTER\n"); - /* prep for recovery */ ata_for_each_link(link, ap, EDGE) { struct ata_eh_context *ehc = &link->eh_context; @@ -3779,7 +3768,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, if (rc && r_failed_link) *r_failed_link = link; - DPRINTK("EXIT, rc=%d\n", rc); return rc; } diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index ba7be3f38617..e2e9cbd405fa 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c @@ -652,8 +652,6 @@ static int sata_pmp_revalidate(struct ata_device *dev, unsigned int new_class) u32 *gscr = (void *)ap->sector_buf; int rc; - DPRINTK("ENTER\n"); - ata_eh_about_to_do(link, NULL, ATA_EH_REVALIDATE); if (!ata_dev_enabled(dev)) { @@ -686,12 +684,10 @@ static int sata_pmp_revalidate(struct ata_device *dev, unsigned int new_class) ata_eh_done(link, NULL, ATA_EH_REVALIDATE); - DPRINTK("EXIT, rc=0\n"); return 0; fail: ata_dev_err(dev, "PMP revalidation failed (errno=%d)\n", rc); - DPRINTK("EXIT, rc=%d\n", rc); return rc; } @@ -759,8 +755,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, int detach = 0, rc = 0; int reval_failed = 0; - DPRINTK("ENTER\n"); - if (dev->flags & ATA_DFLAG_DETACH) { detach = 1; rc = -ENODEV; @@ -828,7 +822,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, /* okay, PMP resurrected */ ehc->i.flags = 0; - DPRINTK("EXIT, rc=0\n"); return 0; fail: @@ -838,7 +831,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap, else ata_dev_disable(dev); - DPRINTK("EXIT, rc=%d\n", rc); return rc; } diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index 4e88597aa9df..7b72c68bc9f7 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -533,8 +533,6 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, u32 scontrol; int rc; - DPRINTK("ENTER\n"); - if (online) *online = false; @@ -610,7 +608,6 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing, *online = false; ata_link_err(link, "COMRESET failed (errno=%d)\n", rc); } - DPRINTK("EXIT, rc=%d\n", rc); return rc; } EXPORT_SYMBOL_GPL(sata_link_hardreset);