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/libahci.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
> index b5f57c69c487..d6c93ce83504 100644
> --- a/drivers/ata/libahci.c
> +++ b/drivers/ata/libahci.c
> @@ -1408,7 +1408,8 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
> bool fbs_disabled = false;
> int rc;
>
> - DPRINTK("ENTER\n");
> + ata_link_dbg(link, "%s: ENTER, class %u pmp %d\n",
> + __func__, *class, pmp);
Please document enhancements in the patch description.
> /* prepare for SRST (AHCI-1.1 10.4.1) */
> rc = ahci_kick_engine(ap);
> @@ -1469,7 +1470,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
> if (fbs_disabled)
> ahci_enable_fbs(ap);
>
> - DPRINTK("EXIT, class=%u\n", *class);
> + ata_link_dbg(link, "%s: EXIT, class=%u\n", __func__, *class);
> return 0;
>
> fail:
> @@ -1491,7 +1492,7 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class,
> {
> int pmp = sata_srst_pmp(link);
>
> - DPRINTK("ENTER\n");
> + ata_link_dbg(link, "%s: ENTER, pmp %d\n", __func__, pmp);
ditto
> return ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready);
> }
> @@ -1522,7 +1523,7 @@ static int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class,
> int rc;
> u32 irq_sts;
>
> - DPRINTK("ENTER\n");
> + ata_link_dbg(link, "%s: ENTER, class %u\n", __func__, *class);
ditto
> rc = ahci_do_softreset(link, class, pmp, deadline,
> ahci_bad_pmp_check_ready);
> @@ -1557,7 +1558,8 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class,
> struct ata_taskfile tf;
> int rc;
>
> - DPRINTK("ENTER\n");
> + ata_link_dbg(link, "%s: ENTER, class %u %sline\n",
> + __func__, *class, *online ? "on" : "off");
ditto
> hpriv->stop_engine(ap);
>
> @@ -1574,7 +1576,7 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class,
> if (*online)
> *class = ahci_dev_classify(ap);
>
> - DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
> + ata_link_dbg(link, "%s: EXIT, rc=%d, class=%u\n", __func__, rc, *class);
> return rc;
> }
> EXPORT_SYMBOL_GPL(ahci_do_hardreset);
> @@ -1686,7 +1688,7 @@ static void ahci_fbs_dec_intr(struct ata_port *ap)
> u32 fbs = readl(port_mmio + PORT_FBS);
> int retries = 3;
>
> - DPRINTK("ENTER\n");
> + ata_port_dbg(ap, "%s: ENTER\n", __func__);
> BUG_ON(!pp->fbs_enabled);
>
> /* time to wait for DEC is not specified by AHCI spec,
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
