Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / usb / image / microtek.h

diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h
index 3271deb8c001694a065b42662543cf2b05066470..ccce318f20a0af4496691f0792f839bf33762ee3 100644 (file)
--- a/drivers/usb/image/microtek.h
+++ b/drivers/usb/image/microtek.h
@@ -8,21 +8,21 @@
  *
  */
 
-typedef void (*mts_scsi_cmnd_callback)(Scsi_Cmnd *);
+typedef void (*mts_scsi_cmnd_callback)(struct scsi_cmnd *);
 
 
 struct mts_transfer_context
 {
        struct mts_desc* instance;
        mts_scsi_cmnd_callback final_callback;
-       Scsi_Cmnd *srb;
+       struct scsi_cmnd *srb;
        
        void* data;
        unsigned data_length;
        int data_pipe;
        int fragment;
 
-       u8 status; /* status returned from ep_response after command completion */
+       u8 *scsi_status; /* status returned from ep_response after command completion */
 };
 
 
@@ -39,7 +39,6 @@ struct mts_desc {
        u8 ep_image;
 
        struct Scsi_Host * host;
-       struct semaphore lock;
 
        struct urb *urb;
        struct mts_transfer_context context;