On 2/4/20 5:55 PM, Hannes Reinecke wrote:
> From: Hannes Reinecke <hare@xxxxxxxx>
>
> Replace all DPRINTK calls with the ata_XXX_dbg functions.
>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> ---
> drivers/ata/libata-core.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 297aa8172d4e..73f89026b2a2 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -2060,7 +2060,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
> unsigned int err_mask;
> bool dma = false;
>
> - DPRINTK("read log page - log 0x%x, page 0x%x\n", log, page);
> + ata_dev_dbg(dev, "read log page - log 0x%x, page 0x%x\n", log, page);
>
> /*
> * Return error without actually issuing the command on controllers
> @@ -2096,7 +2096,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
> goto retry;
> }
>
> - DPRINTK("EXIT, err_mask=%x\n", err_mask);
> + ata_dev_dbg(dev, "EXIT, err_mask=%x\n", err_mask);
> return err_mask;
> }
>
> @@ -3560,7 +3560,7 @@ static int ata_dev_set_mode(struct ata_device *dev)
> dev_err_whine = " (device error ignored)";
> }
>
> - DPRINTK("xfer_shift=%u, xfer_mode=0x%x\n",
> + ata_dev_dbg(dev, "xfer_shift=%u, xfer_mode=0x%x\n",
> dev->xfer_shift, (int)dev->xfer_mode);
>
> if (!(ehc->i.flags & ATA_EHI_QUIET) ||
> @@ -4814,7 +4814,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)
> unsigned int err_mask;
>
> /* set up set-features taskfile */
> - DPRINTK("set features - xfer mode\n");
> + ata_dev_dbg(dev, "set features - xfer mode\n");
>
> /* Some controllers and ATAPI devices show flaky interrupt
> * behavior after setting xfer mode. Use polling instead.
> @@ -4836,7 +4836,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)
> /* On some disks, this command causes spin-up, so we need longer timeout */
> err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000);
>
> - DPRINTK("EXIT, err_mask=%x\n", err_mask);
> + ata_dev_dbg(dev, "EXIT, err_mask=%x\n", err_mask);
> return err_mask;
> }
>
> @@ -4862,7 +4862,8 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 enable, u8 feature)
> unsigned long timeout = 0;
>
> /* set up set-features taskfile */
> - DPRINTK("set features - SATA features\n");
> + ata_dev_dbg(dev, "set features - SATA features enable %u feature %u\n",
> + enable, feature);
>
> ata_tf_init(dev, &tf);
> tf.command = ATA_CMD_SET_FEATURES;
> @@ -4876,7 +4877,7 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 enable, u8 feature)
> ata_probe_timeout * 1000 : SETFEATURES_SPINUP_TIMEOUT;
> err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, timeout);
>
> - DPRINTK("EXIT, err_mask=%x\n", err_mask);
> + ata_dev_dbg(dev, "EXIT, err_mask=%x\n", err_mask);
> return err_mask;
> }
> EXPORT_SYMBOL_GPL(ata_dev_set_feature);
> @@ -4904,7 +4905,8 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
> return AC_ERR_INVALID;
>
> /* set up init dev params taskfile */
> - DPRINTK("init dev params \n");
> + ata_dev_dbg(dev, "init dev params heads %u sectors %u\n",
> + heads, sectors);
>
> ata_tf_init(dev, &tf);
> tf.command = ATA_CMD_INIT_DEV_PARAMS;
> @@ -4920,7 +4922,7 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
> if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED))
> err_mask = 0;
>
> - DPRINTK("EXIT, err_mask=%x\n", err_mask);
> + ata_dev_dbg(dev, "EXIT, err_mask=%x\n", err_mask);
> return err_mask;
> }
>
