Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65396410 authored by Henrik Kretzschmar's avatar Henrik Kretzschmar Committed by James Bottomley
Browse files

[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

drivers/scsi/a2091.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/a2091.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/scsi/a3000.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +110,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 */
@@ -205,7 +205,7 @@ int __init a3000_detect(struct scsi_host_template *tpnt) 
    return 0;

}



static int a3000_bus_reset(Scsi_Cmnd *cmd)

static int a3000_bus_reset(struct scsi_cmnd *cmd)

{

	/* FIXME perform bus-specific reset */

drivers/scsi/a3000.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/scsi/gvp11.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +142,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)

{

    /* stop DMA */
@@ -341,7 +341,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt) 
    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 */