GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

USB: microtek usb scanner: Scsi_Cmnd conversion

Browse source 
Converts obsolete typedef'd Scsi_Cmnd into struct scsi_cmnd.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Henrik Kretzschmar 2006-09-25 17:00:58 -07:00 • committed by Greg Kroah-Hartman
parent 701f35af28
commit 0eebe6ac7c
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/usb/image/microtek.c
View file

@ -225,7 +225,7 @@ static inline void mts_debug_dump(struct mts_desc* desc) {
} }
static inline void mts_show_command(Scsi_Cmnd *srb) static inline void mts_show_command(struct scsi_cmnd *srb)
{ {
char *what = NULL; char *what = NULL;
@ -309,7 +309,7 @@ static inline void mts_show_command(Scsi_Cmnd *srb)
#else #else
static inline void mts_show_command(Scsi_Cmnd * dummy) static inline void mts_show_command(struct scsi_cmnd * dummy)
{ {
} }
@ -338,7 +338,7 @@ static int mts_slave_configure (struct scsi_device *s)
return 0; 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]); struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
@ -349,7 +349,7 @@ static int mts_scsi_abort (Scsi_Cmnd *srb)
return FAILED; 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]); struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
int result, rc; int result, rc;
@ -366,8 +366,8 @@ static int mts_scsi_host_reset (Scsi_Cmnd *srb)
return result ? FAILED : SUCCESS; return result ? FAILED : SUCCESS;
} }
static static int
int mts_scsi_queuecommand (Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback ); mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback);
static void mts_transfer_cleanup( struct urb *transfer ); static void mts_transfer_cleanup( struct urb *transfer );
static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); static void mts_do_sg(struct urb * transfer, struct pt_regs *regs);
@ -537,7 +537,7 @@ static const unsigned char mts_direction[256/8] = {
#define MTS_DIRECTION_IS_IN(x) ((mts_direction[x>>3] >> (x & 7)) & 1) #define MTS_DIRECTION_IS_IN(x) ((mts_direction[x>>3] >> (x & 7)) & 1)
static void 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; int pipe;
struct scatterlist * sg; struct scatterlist * sg;
@ -588,8 +588,8 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )
} }
static static int
int mts_scsi_queuecommand( Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback ) mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback)
{ {
struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
int err = 0; int err = 0;

4
drivers/usb/image/microtek.h
View file

@ -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_transfer_context
{ {
struct mts_desc* instance; struct mts_desc* instance;
mts_scsi_cmnd_callback final_callback; mts_scsi_cmnd_callback final_callback;
Scsi_Cmnd *srb; struct scsi_cmnd *srb;
void* data; void* data;
unsigned data_length; unsigned data_length;