On 12/13/18 11:47 AM, Hannes Reinecke wrote:
> Replace all DPRINTK calls with the ata_XXX_dbg functions.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
> ---
> drivers/ata/pata_octeon_cf.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
> index d3d851b014a3..2e99a11020b0 100644
> --- a/drivers/ata/pata_octeon_cf.c
> +++ b/drivers/ata/pata_octeon_cf.c
> @@ -440,7 +440,7 @@ static int octeon_cf_softreset16(struct ata_link *link, unsigned int *classes,
> int rc;
> u8 err;
>
> - DPRINTK("about to softreset\n");
> + ata_link_dbg(link, "about to softreset\n");
Please preserve __func__ printing in the conversion.
> __raw_writew(ap->ctl, base + 0xe);
> udelay(20);
> __raw_writew(ap->ctl | ATA_SRST, base + 0xe);
> @@ -455,7 +455,8 @@ static int octeon_cf_softreset16(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], 1, &err);
> - DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);
> + ata_link_dbg(link, "EXIT, classes[0]=%u [1]=%u\n",
> + classes[0], classes[1]);
ditto
> return 0;
> }
>
> @@ -525,7 +526,7 @@ static void octeon_cf_exec_command16(struct ata_port *ap,
> blob = 0;
> }
>
> - DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
> + ata_port_dbg(ap, "cmd 0x%X\n", tf->command);
ditto
> blob |= (tf->command << 8);
> __raw_writew(blob, base + 6);
>
> @@ -543,12 +544,12 @@ static void octeon_cf_dma_setup(struct ata_queued_cmd *qc)
> struct octeon_cf_port *cf_port;
>
> cf_port = ap->private_data;
> - DPRINTK("ENTER\n");
> + ata_port_dbg(ap, "ENTER\n");
ditto
> /* issue r/w command */
> qc->cursg = qc->sg;
> cf_port->dma_finished = 0;
> ap->ops->sff_exec_command(ap, &qc->tf);
> - DPRINTK("EXIT\n");
> + ata_port_dbg(ap, "EXIT\n");
ditto
> }
>
> /**
> @@ -678,7 +679,6 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance)
>
> spin_lock_irqsave(&host->lock, flags);
>
> - DPRINTK("ENTER\n");
Please either keep it or document the removal in the patch description.
> for (i = 0; i < host->n_ports; i++) {
> u8 status;
> struct ata_port *ap;
> @@ -732,7 +732,6 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance)
> }
> }
> spin_unlock_irqrestore(&host->lock, flags);
> - DPRINTK("EXIT\n");
ditto
> return IRQ_RETVAL(handled);
> }
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
