ata: libata-scsi: drop DPRINTK calls for cdb translation

Drop DPRINTK calls for cdb translation as they are already covered
by other traces, and also drop the DPRINTK calls in ata_scsi_hotplug().

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index b0b7ab4..bfbb4cc 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1469,9 +1469,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
@@ -1594,7 +1591,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;
        }
@@ -1748,7 +1744,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
 early_finish:
        ata_qc_free(qc);
        scsi_done(cmd);
-       DPRINTK("EXIT - early finish (good or error)\n");
        return 0;
 
 err_did:
@@ -1756,12 +1751,10 @@ err_did:
        cmd->result = (DID_ERROR << 16);
        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
@@ -2512,8 +2505,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
@@ -2552,8 +2543,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
        qc->complete_fn = atapi_sense_complete;
 
        ata_qc_issue(qc);
-
-       DPRINTK("EXIT\n");
 }
 
 /*
@@ -2663,7 +2652,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;
@@ -4053,8 +4041,6 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev)
        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;
        scsi_done(scmd);
        return 0;
@@ -4525,12 +4511,9 @@ void ata_scsi_hotplug(struct work_struct *work)
                container_of(work, struct ata_port, hotplug_task.work);
        int i;
 
-       if (ap->pflags & ATA_PFLAG_UNLOADING) {
-               DPRINTK("ENTER/EXIT - unloading\n");
+       if (ap->pflags & ATA_PFLAG_UNLOADING)
                return;
-       }
 
-       DPRINTK("ENTER\n");
        mutex_lock(&ap->scsi_scan_mutex);
 
        /* Unplug detached devices.  We cannot use link iterator here
@@ -4546,7 +4529,6 @@ void ata_scsi_hotplug(struct work_struct *work)
        ata_scsi_scan_host(ap, 0);
 
        mutex_unlock(&ap->scsi_scan_mutex);
-       DPRINTK("EXIT\n");
 }
 
 /**