On 2/13/20 10:53 AM, Hannes Reinecke wrote:
> The information is now logged with tracepoints, so the DPRINTK
> calls can be dropped.
The addition of trace_*() statements should be in patch #23 and
this patch should contain only the removal of no longer needed
DPRINTK() instances.
[ Just like it has been done in reset tracepoints conversion. ]
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
> ---
> drivers/ata/libata-sff.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
> index 1078b621d47b..f6a54b574b25 100644
> --- a/drivers/ata/libata-sff.c
> +++ b/drivers/ata/libata-sff.c
> @@ -660,7 +660,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
> page = nth_page(page, (offset >> PAGE_SHIFT));
> offset %= PAGE_SIZE;
>
> - DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
> + trace_ata_sff_pio_transfer_data(qc, offset, qc->sect_size);
>
> /* do the actual data transfer */
> buf = kmap_atomic(page);
> @@ -723,7 +723,7 @@ static void ata_pio_sectors(struct ata_queued_cmd *qc)
> static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
> {
> /* send SCSI cdb */
> - DPRINTK("send cdb\n");
> + trace_atapi_send_cdb(qc, 0, qc->dev->cdb_len);
> WARN_ON_ONCE(qc->dev->cdb_len < 12);
>
> ap->ops->sff_data_xfer(qc, qc->cdb, qc->dev->cdb_len, 1);
> @@ -794,7 +794,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
> /* don't cross page boundaries */
> count = min(count, (unsigned int)PAGE_SIZE - offset);
>
> - DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
> + trace_atapi_pio_transfer_data(qc, offset, count);
>
> /* do the actual data transfer */
> buf = kmap_atomic(page);
> @@ -976,8 +976,7 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
> WARN_ON_ONCE(in_wq != ata_hsm_ok_in_wq(ap, qc));
>
> fsm_start:
> - DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
> - ap->print_id, qc->tf.protocol, ap->hsm_task_state, status);
> + trace_ata_sff_hsm_state(qc, status);
>
> switch (ap->hsm_task_state) {
> case HSM_ST_FIRST:
> @@ -1178,8 +1177,7 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
> }
>
> /* no more data to transfer */
> - DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
> - ap->print_id, qc->dev->devno, status);
> + trace_ata_sff_hsm_command_complete(qc, status);
>
> WARN_ON_ONCE(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM));
>
