microtek usb scanner: Scsi_Cmnd convertion
Subsystems (2)
PATCH 1/1 microtek usb scanner: Scsi_Cmnd convertion
From: Henrik Kretzschmar <[email protected]>
Converts obsolete typedef'd Scsi_Cmnd into struct scsi_cmnd.
Signed-off-by Henrik Kretzschmar <[email protected]>
---
drivers/usb/image/microtek.c +9 -9
@@ -225,7 +225,7 @@ } -static inline void mts_show_command (Scsi_Cmnd *srb) +static inline void mts_show_command (struct scsi_cmnd *srb) {char *what =NULL ;
@@ -309,7 +309,7 @@#else -static inline void mts_show_command (Scsi_Cmnd * dummy) +static inline void mts_show_command (struct scsi_cmnd * dummy) { }
@@ -338,7 +338,7 @@return 0 ; } -static int mts_scsi_abort (Scsi_Cmnd *srb) +static int mts_scsi_abort (struct scsi_cmnd *srb) {struct mts_desc * desc = (struct mts_desc *)(srb->device->host->hostdata[0 ]);
@@ -349,7 +349,7 @@return FAILED ; } -static int mts_scsi_host_reset (Scsi_Cmnd *srb) +static int mts_scsi_host_reset (struct scsi_cmnd *srb) {struct mts_desc * desc = (struct mts_desc *)(srb->device->host->hostdata[0 ]);int result, rc;
@@ -366,8 +366,8 @@return result ?FAILED :SUCCESS ; } -static -int mts_scsi_queuecommand (Scsi_Cmnd *srb,mts_scsi_cmnd_callback callback ); +static int +mts_scsi_queuecommand (struct scsi_cmnd *srb,mts_scsi_cmnd_callback callback);static void mts_transfer_cleanup (struct urb *transfer );static void mts_do_sg (struct urb * transfer,struct pt_regs *regs);
@@ -537,7 +537,7 @@#define MTS_DIRECTION_IS_IN (x) ((mts_direction[x>>3] >> (x & 7)) & 1)static void -mts_build_transfer_context (Scsi_Cmnd *srb,struct mts_desc * desc ) +mts_build_transfer_context (struct scsi_cmnd *srb,struct mts_desc * desc) {int pipe;struct scatterlist * sg;
@@ -588,8 +588,8 @@ } -static -int mts_scsi_queuecommand (Scsi_Cmnd *srb,mts_scsi_cmnd_callback callback ) +static int +mts_scsi_queuecommand (struct scsi_cmnd *srb,mts_scsi_cmnd_callback callback) {struct mts_desc * desc = (struct mts_desc *)(srb->device->host->hostdata[0 ]);int err =0 ;
drivers/usb/image/microtek.h +2 -2
@@ -8,14 +8,14 @@* */ -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;