On 2/4/20 5:55 PM, Hannes Reinecke wrote:
> Drop DPRINTK calls for cdb translation as they are already covered
> by other traces, and convert the DPRINTK calls in ata_scsi_hotplug()
> to ata_port_dbg() calls.
>
> 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-scsi.c | 20 +++-----------------
> 1 file changed, 3 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index eb2eb599e602..91b69ebef268 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -1761,9 +1761,6 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc)
> head = track % dev->heads;
> sect = (u32)block % dev->sectors + 1;
>
> - DPRINTK("block %u track %u cyl %u head %u sect %u\n",
> - (u32)block, track, cyl, head, sect);
> -
> /* Check whether the converted CHS can fit.
> Cylinder: 0-65535
> Head: 0-15
> @@ -1886,7 +1883,6 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
> goto invalid_fld;
> break;
> default:
> - DPRINTK("no-byte command\n");
> fp = 0;
> goto invalid_fld;
> }
> @@ -2040,7 +2036,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
> early_finish:
> ata_qc_free(qc);
> cmd->scsi_done(cmd);
> - DPRINTK("EXIT - early finish (good or error)\n");
> return 0;
>
> err_did:
> @@ -2048,12 +2043,10 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
> cmd->result = (DID_ERROR << 16);
> cmd->scsi_done(cmd);
> err_mem:
> - DPRINTK("EXIT - internal\n");
> return 0;
>
> defer:
> ata_qc_free(qc);
> - DPRINTK("EXIT - defer\n");
> if (rc == ATA_DEFER_LINK)
> return SCSI_MLQUEUE_DEVICE_BUSY;
> else
> @@ -2820,8 +2813,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
> struct ata_port *ap = qc->ap;
> struct scsi_cmnd *cmd = qc->scsicmd;
>
> - DPRINTK("ATAPI request sense\n");
> -
> memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
>
> #ifdef CONFIG_ATA_SFF
> @@ -2860,8 +2851,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
> qc->complete_fn = atapi_sense_complete;
>
> ata_qc_issue(qc);
> -
> - DPRINTK("EXIT\n");
> }
>
> /*
> @@ -2971,7 +2960,6 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
> qc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
> if (scmd->sc_data_direction == DMA_TO_DEVICE) {
> qc->tf.flags |= ATA_TFLAG_WRITE;
> - DPRINTK("direction: write\n");
> }
>
> qc->tf.command = ATA_CMD_PACKET;
> @@ -4355,8 +4343,6 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
> return rc;
>
> bad_cdb_len:
> - DPRINTK("bad CDB len=%u, scsi_op=0x%02x, max=%u\n",
> - scmd->cmd_len, scsi_op, dev->cdb_len);
> scmd->result = DID_ERROR << 16;
> scmd->scsi_done(scmd);
> return 0;
> @@ -4796,11 +4782,11 @@ void ata_scsi_hotplug(struct work_struct *work)
> int i;
>
> if (ap->pflags & ATA_PFLAG_UNLOADING) {
> - DPRINTK("ENTER/EXIT - unloading\n");
> + ata_port_dbg(ap, "unloading\n");
> return;
> }
>
> - DPRINTK("ENTER\n");
> + ata_port_dbg(ap, "ENTER\n");
> mutex_lock(&ap->scsi_scan_mutex);
>
> /* Unplug detached devices. We cannot use link iterator here
> @@ -4816,7 +4802,7 @@ void ata_scsi_hotplug(struct work_struct *work)
> ata_scsi_scan_host(ap, 0);
>
> mutex_unlock(&ap->scsi_scan_mutex);
> - DPRINTK("EXIT\n");
> + ata_port_dbg(ap, "EXIT\n");
> }
>
> /**
>
