mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
[SCSI] wd33c93: Scsi_Cmnd convertion
Changes obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
a506b44bb5
commit
65396410af
9 changed files with 18 additions and 34 deletions
|
@ -40,7 +40,7 @@ static irqreturn_t a2091_intr (int irq, void *_instance, struct pt_regs *fp)
|
|||
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 long addr = virt_to_bus(cmd->SCp.ptr);
|
||||
|
@ -115,7 +115,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
|
|||
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)
|
||||
{
|
||||
/* disable SCSI interrupts */
|
||||
|
@ -217,7 +217,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
|
|||
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 */
|
||||
|
||||
|
|
|
@ -13,10 +13,6 @@
|
|||
|
||||
int a2091_detect(struct scsi_host_template *);
|
||||
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
|
||||
#define CMD_PER_LUN 2
|
||||
|
|
|
@ -44,7 +44,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp)
|
|||
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 long addr = virt_to_bus(cmd->SCp.ptr);
|
||||
|
@ -110,8 +110,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
|
||||
int status)
|
||||
static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
|
||||
int status)
|
||||
{
|
||||
/* disable SCSI interrupts */
|
||||
unsigned short cntr = CNTR_PDMD;
|
||||
|
@ -205,7 +205,7 @@ fail_register:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int a3000_bus_reset(Scsi_Cmnd *cmd)
|
||||
static int a3000_bus_reset(struct scsi_cmnd *cmd)
|
||||
{
|
||||
/* FIXME perform bus-specific reset */
|
||||
|
||||
|
|
|
@ -13,10 +13,6 @@
|
|||
|
||||
int a3000_detect(struct scsi_host_template *);
|
||||
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
|
||||
#define CMD_PER_LUN 2
|
||||
|
|
|
@ -47,7 +47,7 @@ void gvp11_setup (char *str, int *ints)
|
|||
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 long addr = virt_to_bus(cmd->SCp.ptr);
|
||||
|
@ -142,8 +142,8 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
|
||||
int status)
|
||||
static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
|
||||
int status)
|
||||
{
|
||||
/* stop DMA */
|
||||
DMA(instance)->SP_DMA = 1;
|
||||
|
@ -341,7 +341,7 @@ release:
|
|||
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 */
|
||||
|
||||
|
|
|
@ -13,10 +13,6 @@
|
|||
|
||||
int gvp11_detect(struct scsi_host_template *);
|
||||
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
|
||||
#define CMD_PER_LUN 2
|
||||
|
|
|
@ -29,7 +29,7 @@ static irqreturn_t mvme147_intr (int irq, void *dummy, struct pt_regs *fp)
|
|||
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 long addr = virt_to_bus(cmd->SCp.ptr);
|
||||
|
@ -57,7 +57,7 @@ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
|
|||
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)
|
||||
{
|
||||
m147_pcc->dma_cntrl = 0;
|
||||
|
@ -112,7 +112,7 @@ int mvme147_detect(struct scsi_host_template *tpnt)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mvme147_bus_reset(Scsi_Cmnd *cmd)
|
||||
static int mvme147_bus_reset(struct scsi_cmnd *cmd)
|
||||
{
|
||||
/* FIXME perform bus-specific reset */
|
||||
|
||||
|
|
|
@ -12,10 +12,6 @@
|
|||
|
||||
int mvme147_detect(struct scsi_host_template *);
|
||||
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
|
||||
#define CMD_PER_LUN 2
|
||||
|
|
|
@ -97,7 +97,7 @@ static irqreturn_t sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs)
|
|||
}
|
||||
|
||||
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;
|
||||
void *addr = cmd->SCp.ptr;
|
||||
|
@ -129,7 +129,7 @@ void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp)
|
|||
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 hpc3_scsiregs *hregs =
|
||||
|
@ -163,7 +163,7 @@ static int dma_setup(Scsi_Cmnd *cmd, int datainp)
|
|||
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)
|
||||
{
|
||||
struct ip22_hostdata *hdata = HDATA(instance);
|
||||
|
@ -305,7 +305,7 @@ static int sgiwd93_release(struct Scsi_Host *instance)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
|
||||
static int sgiwd93_bus_reset(struct scsi_cmnd *cmd)
|
||||
{
|
||||
/* FIXME perform bus-specific reset */
|
||||
|
||||
|
|
Loading…
Reference in a new issue