On 12/13/18 11:46 AM, Hannes Reinecke wrote:
> Replace all DPRINTK calls with the ata_XXX_dbg functions.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
> ---
> drivers/ata/sata_rcar.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
> index 4b1ff5bc256a..0c60d46eb7ae 100644
> --- a/drivers/ata/sata_rcar.c
> +++ b/drivers/ata/sata_rcar.c
> @@ -323,7 +323,7 @@ static int sata_rcar_bus_softreset(struct ata_port *ap, unsigned long deadline)
> {
> struct ata_ioports *ioaddr = &ap->ioaddr;
>
> - DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
> + ata_port_dbg(ap, "bus reset via SRST\n");
Please preserve __func__ printing in the conversion.
> /* software reset. causes dev0 to be selected */
> iowrite32(ap->ctl, ioaddr->ctl_addr);
> @@ -350,7 +350,7 @@ static int sata_rcar_softreset(struct ata_link *link, unsigned int *classes,
> devmask |= 1 << 0;
>
> /* issue bus reset */
> - DPRINTK("about to softreset, devmask=%x\n", devmask);
> + ata_link_dbg(link, "about to softreset, devmask=%x\n", devmask);
ditto
> rc = sata_rcar_bus_softreset(ap, deadline);
> /* if link is occupied, -ENODEV too is an error */
> if (rc && (rc != -ENODEV || sata_scr_valid(link))) {
> @@ -361,7 +361,7 @@ static int sata_rcar_softreset(struct ata_link *link, unsigned int *classes,
> /* determine by signature whether we have ATA or ATAPI devices */
> classes[0] = ata_sff_dev_classify(&link->device[0], devmask, &err);
>
> - DPRINTK("classes[0]=%u\n", classes[0]);
> + ata_link_dbg(link, "classes[0]=%u\n", classes[0]);
ditto
> return 0;
> }
>
> @@ -440,7 +440,7 @@ static void sata_rcar_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
> static void sata_rcar_exec_command(struct ata_port *ap,
> const struct ata_taskfile *tf)
> {
> - DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
> + ata_port_dbg(ap, "cmd 0x%X\n", tf->command);
ditto
> iowrite32(tf->command, ap->ioaddr.command_addr);
> ata_sff_pause(ap);
> @@ -683,7 +683,7 @@ static void sata_rcar_serr_interrupt(struct ata_port *ap)
> if (!serror)
> return;
>
> - DPRINTK("SError @host_intr: 0x%x\n", serror);
> + ata_port_dbg(ap, "SError @host_intr: 0x%x\n", serror);
ditto
> /* first, analyze and record host port events */
> ata_ehi_clear_desc(ehi);
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
