diff options
Diffstat (limited to 'drivers/usb/image/microtek.c')
-rw-r--r-- | drivers/usb/image/microtek.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index b2bafc37c414..5f861331932a 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
@@ -225,7 +225,7 @@ static inline void mts_debug_dump(struct mts_desc* desc) { | |||
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | ||
228 | static inline void mts_show_command(Scsi_Cmnd *srb) | 228 | static inline void mts_show_command(struct scsi_cmnd *srb) |
229 | { | 229 | { |
230 | char *what = NULL; | 230 | char *what = NULL; |
231 | 231 | ||
@@ -309,7 +309,7 @@ static inline void mts_show_command(Scsi_Cmnd *srb) | |||
309 | 309 | ||
310 | #else | 310 | #else |
311 | 311 | ||
312 | static inline void mts_show_command(Scsi_Cmnd * dummy) | 312 | static inline void mts_show_command(struct scsi_cmnd * dummy) |
313 | { | 313 | { |
314 | } | 314 | } |
315 | 315 | ||
@@ -338,7 +338,7 @@ static int mts_slave_configure (struct scsi_device *s) | |||
338 | return 0; | 338 | return 0; |
339 | } | 339 | } |
340 | 340 | ||
341 | static int mts_scsi_abort (Scsi_Cmnd *srb) | 341 | static int mts_scsi_abort(struct scsi_cmnd *srb) |
342 | { | 342 | { |
343 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); | 343 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); |
344 | 344 | ||
@@ -349,7 +349,7 @@ static int mts_scsi_abort (Scsi_Cmnd *srb) | |||
349 | return FAILED; | 349 | return FAILED; |
350 | } | 350 | } |
351 | 351 | ||
352 | static int mts_scsi_host_reset (Scsi_Cmnd *srb) | 352 | static int mts_scsi_host_reset(struct scsi_cmnd *srb) |
353 | { | 353 | { |
354 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); | 354 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); |
355 | int result, rc; | 355 | int result, rc; |
@@ -366,8 +366,8 @@ static int mts_scsi_host_reset (Scsi_Cmnd *srb) | |||
366 | return result ? FAILED : SUCCESS; | 366 | return result ? FAILED : SUCCESS; |
367 | } | 367 | } |
368 | 368 | ||
369 | static | 369 | static int |
370 | int mts_scsi_queuecommand (Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback ); | 370 | mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback); |
371 | 371 | ||
372 | static void mts_transfer_cleanup( struct urb *transfer ); | 372 | static void mts_transfer_cleanup( struct urb *transfer ); |
373 | static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); | 373 | static void mts_do_sg(struct urb * transfer, struct pt_regs *regs); |
@@ -537,7 +537,7 @@ static const unsigned char mts_direction[256/8] = { | |||
537 | #define MTS_DIRECTION_IS_IN(x) ((mts_direction[x>>3] >> (x & 7)) & 1) | 537 | #define MTS_DIRECTION_IS_IN(x) ((mts_direction[x>>3] >> (x & 7)) & 1) |
538 | 538 | ||
539 | static void | 539 | static void |
540 | mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc ) | 540 | mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc) |
541 | { | 541 | { |
542 | int pipe; | 542 | int pipe; |
543 | struct scatterlist * sg; | 543 | struct scatterlist * sg; |
@@ -588,8 +588,8 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc ) | |||
588 | } | 588 | } |
589 | 589 | ||
590 | 590 | ||
591 | static | 591 | static int |
592 | int mts_scsi_queuecommand( Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback ) | 592 | mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback) |
593 | { | 593 | { |
594 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); | 594 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); |
595 | int err = 0; | 595 | int err = 0; |