Skip to content

L
linux-davinci
Commit 65396410 authored by Henrik Kretzschmar's avatar Henrik Kretzschmar Committed by James Bottomley
Browse files
Options

[SCSI] wd33c93: Scsi_Cmnd convertion 

Changes obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd.
Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a506b44b
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 34 deletions
drivers/scsi/a2091.c
View file @ 65396410
...@@ -40,7 +40,7 @@ static irqreturn_t a2091_intr (int irq, void *_instance, struct pt_regs *fp) ...@@ -40,7 +40,7 @@ static irqreturn_t a2091_intr (int irq, void *_instance, struct pt_regs *fp)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int dma_setup (Scsi_Cmnd *cmd, int dir_in) static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
unsigned short cntr = CNTR_PDMD | CNTR_INTEN; unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
...@@ -115,7 +115,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in) ...@@ -115,7 +115,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
return 0; return 0;
} }
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
/* disable SCSI interrupts */ /* disable SCSI interrupts */
...@@ -217,7 +217,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt) ...@@ -217,7 +217,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
return num_a2091; return num_a2091;
} }
static int a2091_bus_reset(Scsi_Cmnd *cmd) static int a2091_bus_reset(struct scsi_cmnd *cmd)
{ {
/* FIXME perform bus-specific reset */ /* FIXME perform bus-specific reset */
......
drivers/scsi/a2091.h
View file @ 65396410
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
int a2091_detect(struct scsi_host_template *); int a2091_detect(struct scsi_host_template *);
int a2091_release(struct Scsi_Host *); int a2091_release(struct Scsi_Host *);
const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd33c93_abort(Scsi_Cmnd *);
int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
......
drivers/scsi/a3000.c
View file @ 65396410
...@@ -44,7 +44,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp) ...@@ -44,7 +44,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp)
return IRQ_NONE; return IRQ_NONE;
} }
static int dma_setup (Scsi_Cmnd *cmd, int dir_in) static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
unsigned short cntr = CNTR_PDMD | CNTR_INTEN; unsigned short cntr = CNTR_PDMD | CNTR_INTEN;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
...@@ -110,8 +110,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in) ...@@ -110,8 +110,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
return 0; return 0;
} }
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
/* disable SCSI interrupts */ /* disable SCSI interrupts */
unsigned short cntr = CNTR_PDMD; unsigned short cntr = CNTR_PDMD;
...@@ -205,7 +205,7 @@ fail_register: ...@@ -205,7 +205,7 @@ fail_register:
return 0; return 0;
} }
static int a3000_bus_reset(Scsi_Cmnd *cmd) static int a3000_bus_reset(struct scsi_cmnd *cmd)
{ {
/* FIXME perform bus-specific reset */ /* FIXME perform bus-specific reset */
......
drivers/scsi/a3000.h
View file @ 65396410
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
int a3000_detect(struct scsi_host_template *); int a3000_detect(struct scsi_host_template *);
int a3000_release(struct Scsi_Host *); int a3000_release(struct Scsi_Host *);
const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd33c93_abort(Scsi_Cmnd *);
int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
......
drivers/scsi/gvp11.c
View file @ 65396410
...@@ -47,7 +47,7 @@ void gvp11_setup (char *str, int *ints) ...@@ -47,7 +47,7 @@ void gvp11_setup (char *str, int *ints)
gvp11_xfer_mask = ints[1]; gvp11_xfer_mask = ints[1];
} }
static int dma_setup (Scsi_Cmnd *cmd, int dir_in) static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
unsigned short cntr = GVP11_DMAC_INT_ENABLE; unsigned short cntr = GVP11_DMAC_INT_ENABLE;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
...@@ -142,8 +142,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in) ...@@ -142,8 +142,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
return 0; return 0;
} }
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
/* stop DMA */ /* stop DMA */
DMA(instance)->SP_DMA = 1; DMA(instance)->SP_DMA = 1;
...@@ -341,7 +341,7 @@ release: ...@@ -341,7 +341,7 @@ release:
return num_gvp11; return num_gvp11;
} }
static int gvp11_bus_reset(Scsi_Cmnd *cmd) static int gvp11_bus_reset(struct scsi_cmnd *cmd)
{ {
/* FIXME perform bus-specific reset */ /* FIXME perform bus-specific reset */
......
drivers/scsi/gvp11.h
View file @ 65396410
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
int gvp11_detect(struct scsi_host_template *); int gvp11_detect(struct scsi_host_template *);
int gvp11_release(struct Scsi_Host *); int gvp11_release(struct Scsi_Host *);
const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd33c93_abort(Scsi_Cmnd *);
int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
......
drivers/scsi/mvme147.c
View file @ 65396410
...@@ -29,7 +29,7 @@ static irqreturn_t mvme147_intr (int irq, void *dummy, struct pt_regs *fp) ...@@ -29,7 +29,7 @@ static irqreturn_t mvme147_intr (int irq, void *dummy, struct pt_regs *fp)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int dma_setup (Scsi_Cmnd *cmd, int dir_in) static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
unsigned char flags = 0x01; unsigned char flags = 0x01;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
...@@ -57,7 +57,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in) ...@@ -57,7 +57,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
return 0; return 0;
} }
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
m147_pcc->dma_cntrl = 0; m147_pcc->dma_cntrl = 0;
...@@ -112,7 +112,7 @@ int mvme147_detect(struct scsi_host_template *tpnt) ...@@ -112,7 +112,7 @@ int mvme147_detect(struct scsi_host_template *tpnt)
return 0; return 0;
} }
static int mvme147_bus_reset(Scsi_Cmnd *cmd) static int mvme147_bus_reset(struct scsi_cmnd *cmd)
{ {
/* FIXME perform bus-specific reset */ /* FIXME perform bus-specific reset */
......
drivers/scsi/mvme147.h
View file @ 65396410
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
int mvme147_detect(struct scsi_host_template *); int mvme147_detect(struct scsi_host_template *);
int mvme147_release(struct Scsi_Host *); int mvme147_release(struct Scsi_Host *);
const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd33c93_abort(Scsi_Cmnd *);
int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
......
drivers/scsi/sgiwd93.c
View file @ 65396410
...@@ -97,7 +97,7 @@ static irqreturn_t sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -97,7 +97,7 @@ static irqreturn_t sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs)
} }
static inline static inline
void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp) void fill_hpc_entries(struct hpc_chunk *hcp, struct scsi_cmnd *cmd, int datainp)
{ {
unsigned long len = cmd->SCp.this_residual; unsigned long len = cmd->SCp.this_residual;
void *addr = cmd->SCp.ptr; void *addr = cmd->SCp.ptr;
...@@ -129,7 +129,7 @@ void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp) ...@@ -129,7 +129,7 @@ void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp)
hcp->desc.cntinfo = HPCDMA_EOX; hcp->desc.cntinfo = HPCDMA_EOX;
} }
static int dma_setup(Scsi_Cmnd *cmd, int datainp) static int dma_setup(struct scsi_cmnd *cmd, int datainp)
{ {
struct ip22_hostdata *hdata = HDATA(cmd->device->host); struct ip22_hostdata *hdata = HDATA(cmd->device->host);
struct hpc3_scsiregs *hregs = struct hpc3_scsiregs *hregs =
...@@ -163,7 +163,7 @@ static int dma_setup(Scsi_Cmnd *cmd, int datainp) ...@@ -163,7 +163,7 @@ static int dma_setup(Scsi_Cmnd *cmd, int datainp)
return 0; return 0;
} }
static void dma_stop(struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int status) int status)
{ {
struct ip22_hostdata *hdata = HDATA(instance); struct ip22_hostdata *hdata = HDATA(instance);
...@@ -305,7 +305,7 @@ static int sgiwd93_release(struct Scsi_Host *instance) ...@@ -305,7 +305,7 @@ static int sgiwd93_release(struct Scsi_Host *instance)
return 1; return 1;
} }
static int sgiwd93_bus_reset(Scsi_Cmnd *cmd) static int sgiwd93_bus_reset(struct scsi_cmnd *cmd)
{ {
/* FIXME perform bus-specific reset */ /* FIXME perform bus-specific reset */
......
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