| Message ID | 20200204165547.115220-24-hare@suse.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | ata: kill ATA_DEBUG | expand |
On 2/4/20 5:55 PM, Hannes Reinecke wrote: > Reset 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> Also you may consider merging patches #15-23 together. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/ata/libata-sff.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c > index 60509997137f..f1799291b4a6 100644 > --- a/drivers/ata/libata-sff.c > +++ b/drivers/ata/libata-sff.c > @@ -1946,8 +1946,6 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask, > { > struct ata_ioports *ioaddr = &ap->ioaddr; > > - DPRINTK("ata%u: bus reset via SRST\n", ap->print_id); > - > if (ap->ioaddr.ctl_addr) { > /* software reset. causes dev0 to be selected */ > iowrite8(ap->ctl, ioaddr->ctl_addr); > @@ -1985,8 +1983,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, > int rc; > u8 err; > > - DPRINTK("ENTER\n"); > - > /* determine if device 0/1 are present */ > if (ata_devchk(ap, 0)) > devmask |= (1 << 0); > @@ -1997,7 +1993,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, > ap->ops->sff_dev_select(ap, 0); > > /* issue bus reset */ > - DPRINTK("about to softreset, devmask=%x\n", devmask); > rc = ata_bus_softreset(ap, devmask, deadline); > /* if link is occupied, -ENODEV too is an error */ > if (rc && (rc != -ENODEV || sata_scr_valid(link))) { > @@ -2012,7 +2007,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, > classes[1] = ata_sff_dev_classify(&link->device[1], > devmask & (1 << 1), &err); > > - DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]); > return 0; > } > EXPORT_SYMBOL_GPL(ata_sff_softreset); > @@ -2045,7 +2039,6 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class, > if (online) > *class = ata_sff_dev_classify(link->device, 1, NULL); > > - DPRINTK("EXIT, class=%u\n", *class); > return rc; > } > EXPORT_SYMBOL_GPL(sata_sff_hardreset); >
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 60509997137f..f1799291b4a6 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -1946,8 +1946,6 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask, { struct ata_ioports *ioaddr = &ap->ioaddr; - DPRINTK("ata%u: bus reset via SRST\n", ap->print_id); - if (ap->ioaddr.ctl_addr) { /* software reset. causes dev0 to be selected */ iowrite8(ap->ctl, ioaddr->ctl_addr); @@ -1985,8 +1983,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, int rc; u8 err; - DPRINTK("ENTER\n"); - /* determine if device 0/1 are present */ if (ata_devchk(ap, 0)) devmask |= (1 << 0); @@ -1997,7 +1993,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, ap->ops->sff_dev_select(ap, 0); /* issue bus reset */ - DPRINTK("about to softreset, devmask=%x\n", devmask); rc = ata_bus_softreset(ap, devmask, deadline); /* if link is occupied, -ENODEV too is an error */ if (rc && (rc != -ENODEV || sata_scr_valid(link))) { @@ -2012,7 +2007,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, classes[1] = ata_sff_dev_classify(&link->device[1], devmask & (1 << 1), &err); - DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]); return 0; } EXPORT_SYMBOL_GPL(ata_sff_softreset); @@ -2045,7 +2039,6 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class, if (online) *class = ata_sff_dev_classify(link->device, 1, NULL); - DPRINTK("EXIT, class=%u\n", *class); return rc; } EXPORT_SYMBOL_GPL(sata_sff_hardreset);
Reset is now logged with tracepoints, so the DPRINTK() calls can be dropped. Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/libata-sff.c | 7 ------- 1 file changed, 7 deletions(-)