Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / staging / keucr / transport.c

diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index ab1eccdee583d536b74d40e45268babacaad28de..aeb2186d62ca8e40b7b4f16a24134d91082b87d6 100644 (file)
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -78,6 +78,47 @@ static int usb_stor_msg_common(struct us_data *us, int timeout)
        return us->current_urb->status;
 }
 
+/*
+ * usb_stor_print_cmd():
+ */
+static void usb_stor_print_cmd(struct us_data *us, struct scsi_cmnd *srb)
+{
+       PBYTE   Cdb = srb->cmnd;
+       DWORD   cmd = Cdb[0];
+
+       switch (cmd) {
+       case TEST_UNIT_READY:
+               break;
+       case INQUIRY:
+               dev_dbg(&us->pusb_dev->dev,
+                               "scsi cmd %X --- SCSIOP_INQUIRY\n", cmd);
+               break;
+       case MODE_SENSE:
+               dev_dbg(&us->pusb_dev->dev,
+                               "scsi cmd %X --- SCSIOP_MODE_SENSE\n", cmd);
+               break;
+       case START_STOP:
+               dev_dbg(&us->pusb_dev->dev,
+                               "scsi cmd %X --- SCSIOP_START_STOP\n", cmd);
+               break;
+       case READ_CAPACITY:
+               dev_dbg(&us->pusb_dev->dev,
+                               "scsi cmd %X --- SCSIOP_READ_CAPACITY\n", cmd);
+               break;
+       case READ_10:
+               break;
+       case WRITE_10:
+               break;
+       case ALLOW_MEDIUM_REMOVAL:
+               dev_dbg(&us->pusb_dev->dev,
+                       "scsi cmd %X --- SCSIOP_ALLOW_MEDIUM_REMOVAL\n", cmd);
+               break;
+       default:
+               dev_dbg(&us->pusb_dev->dev, "scsi cmd %X --- Other cmd\n", cmd);
+               break;
+       }
+}
+
 /*
  * usb_stor_control_msg()
  */
@@ -303,7 +344,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
        int result;
 
        /* pr_info("transport --- usb_stor_invoke_transport\n"); */
-       usb_stor_print_cmd(srb);
+       usb_stor_print_cmd(us, srb);
        /* send the command to the transport layer */
        scsi_set_resid(srb, 0);
        result = us->transport(srb, us); /* usb_stor_Bulk_transport; */
@@ -429,7 +470,7 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
        int result = 0;
 
        /* pr_info("transport --- ENE_stor_invoke_transport\n"); */
-       usb_stor_print_cmd(srb);
+       usb_stor_print_cmd(us, srb);
        /* send the command to the transport layer */
        scsi_set_resid(srb, 0);
        if (!(us->SM_Status.Ready))