Skip to content

L
linux-davinci
Commit 811c9366 authored by Henne's avatar Henne Committed by James Bottomley
Browse files
Options

[SCSI] Scsi_Cmnd convertion in sun3-driver 

Change the obsolete Scsi_Cmnd to struct scsi_cmnd in the sun3-driver.
Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 53a5fbdc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 61 deletions
drivers/scsi/sun3_NCR5380.c
View file @ 811c9366
This diff is collapsed.
drivers/scsi/sun3_scsi.c
View file @ 811c9366
...@@ -119,7 +119,7 @@ module_param(setup_use_tagged_queuing, int, 0); ...@@ -119,7 +119,7 @@ module_param(setup_use_tagged_queuing, int, 0);
static int setup_hostid = -1; static int setup_hostid = -1;
module_param(setup_hostid, int, 0); module_param(setup_hostid, int, 0);
static Scsi_Cmnd *sun3_dma_setup_done = NULL; static struct scsi_cmnd *sun3_dma_setup_done = NULL;
#define AFTER_RESET_DELAY (HZ/2) #define AFTER_RESET_DELAY (HZ/2)
...@@ -521,7 +521,8 @@ static inline unsigned long sun3scsi_dma_residual(struct Scsi_Host *instance) ...@@ -521,7 +521,8 @@ static inline unsigned long sun3scsi_dma_residual(struct Scsi_Host *instance)
return last_residual; return last_residual;
} }
static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted, Scsi_Cmnd *cmd, static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted,
struct scsi_cmnd *cmd,
int write_flag) int write_flag)
{ {
if(blk_fs_request(cmd->request)) if(blk_fs_request(cmd->request))
......
drivers/scsi/sun3_scsi.h
View file @ 811c9366
...@@ -47,11 +47,12 @@ ...@@ -47,11 +47,12 @@
#define IOBASE_SUN3_VMESCSI 0xff200000 #define IOBASE_SUN3_VMESCSI 0xff200000
static int sun3scsi_abort (Scsi_Cmnd *); static int sun3scsi_abort(struct scsi_cmnd *);
static int sun3scsi_detect (struct scsi_host_template *); static int sun3scsi_detect (struct scsi_host_template *);
static const char *sun3scsi_info (struct Scsi_Host *); static const char *sun3scsi_info (struct Scsi_Host *);
static int sun3scsi_bus_reset(Scsi_Cmnd *); static int sun3scsi_bus_reset(struct scsi_cmnd *);
static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int sun3scsi_queue_command(struct scsi_cmnd *,
void (*done)(struct scsi_cmnd *));
static int sun3scsi_release (struct Scsi_Host *); static int sun3scsi_release (struct Scsi_Host *);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
......
drivers/scsi/sun3_scsi_vme.c
View file @ 811c9366
...@@ -84,7 +84,7 @@ module_param(setup_use_tagged_queuing, int, 0); ...@@ -84,7 +84,7 @@ module_param(setup_use_tagged_queuing, int, 0);
static int setup_hostid = -1; static int setup_hostid = -1;
module_param(setup_hostid, int, 0); module_param(setup_hostid, int, 0);
static Scsi_Cmnd *sun3_dma_setup_done = NULL; static struct scsi_cmnd *sun3_dma_setup_done = NULL;
#define AFTER_RESET_DELAY (HZ/2) #define AFTER_RESET_DELAY (HZ/2)
...@@ -455,7 +455,8 @@ static inline unsigned long sun3scsi_dma_residual(struct Scsi_Host *instance) ...@@ -455,7 +455,8 @@ static inline unsigned long sun3scsi_dma_residual(struct Scsi_Host *instance)
return last_residual; return last_residual;
} }
static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted, Scsi_Cmnd *cmd, static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted,
struct scsi_cmnd *cmd,
int write_flag) int write_flag)
{ {
if(blk_fs_request(cmd->request)) if(blk_fs_request(cmd->request))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment