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

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

[SCSI] scsi-driver ultrastore replace Scsi_Cmnd with struct scsi_cmnd 



Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f479ab87

drivers/scsi/ultrastor.c

+12 −11
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ struct mscp { 
  u32 sense_data PACKED;

  /* The following fields are for software only.  They are included in

     the MSCP structure because they are associated with SCSI requests.  */

  void (*done)(Scsi_Cmnd *);

  Scsi_Cmnd *SCint;

  void (*done) (struct scsi_cmnd *);

  struct scsi_cmnd *SCint;

  ultrastor_sg_list sglist[ULTRASTOR_24F_MAX_SG]; /* use larger size for 24F */

};
@@ -289,7 +289,7 @@ static const unsigned short ultrastor_ports_14f[] = { 


static void ultrastor_interrupt(int, void *, struct pt_regs *);

static irqreturn_t do_ultrastor_interrupt(int, void *, struct pt_regs *);

static inline void build_sg_list(struct mscp *, Scsi_Cmnd *SCpnt);

static inline void build_sg_list(struct mscp *, struct scsi_cmnd *SCpnt);





/* Always called with host lock held */
@@ -673,7 +673,7 @@ static const char *ultrastor_info(struct Scsi_Host * shpnt) 
    return buf;

}



static inline void build_sg_list(struct mscp *mscp, Scsi_Cmnd *SCpnt)

static inline void build_sg_list(struct mscp *mscp, struct scsi_cmnd *SCpnt)

{

	struct scatterlist *sl;

	long transfer_length = 0;
@@ -694,7 +694,8 @@ static inline void build_sg_list(struct mscp *mscp, Scsi_Cmnd *SCpnt) 
	mscp->transfer_data_length = transfer_length;

}



static int ultrastor_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))

static int ultrastor_queuecommand(struct scsi_cmnd *SCpnt,

				void (*done) (struct scsi_cmnd *))

{

    struct mscp *my_mscp;

#if ULTRASTOR_MAX_CMDS > 1
@@ -833,7 +834,7 @@ retry: 


 */



static int ultrastor_abort(Scsi_Cmnd *SCpnt)

static int ultrastor_abort(struct scsi_cmnd *SCpnt)

{

#if ULTRASTOR_DEBUG & UD_ABORT

    char out[108];
@@ -843,7 +844,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt) 
    unsigned int mscp_index;

    unsigned char old_aborted;

    unsigned long flags;

    void (*done)(Scsi_Cmnd *);

    void (*done)(struct scsi_cmnd *);

    struct Scsi_Host *host = SCpnt->device->host;



    if(config.slot)
@@ -960,7 +961,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt) 
    return SUCCESS;

}



static int ultrastor_host_reset(Scsi_Cmnd * SCpnt)

static int ultrastor_host_reset(struct scsi_cmnd * SCpnt)

{

    unsigned long flags;

    int i;
@@ -1045,8 +1046,8 @@ static void ultrastor_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
    unsigned int mscp_index;

#endif

    struct mscp *mscp;

    void (*done)(Scsi_Cmnd *);

    Scsi_Cmnd *SCtmp;

    void (*done) (struct scsi_cmnd *);

    struct scsi_cmnd *SCtmp;



#if ULTRASTOR_MAX_CMDS == 1

    mscp = &config.mscp[0];
@@ -1079,7 +1080,7 @@ static void ultrastor_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	    return;

	}

	if (icm_status == 3) {

	    void (*done)(Scsi_Cmnd *) = mscp->done;

	    void (*done)(struct scsi_cmnd *) = mscp->done;

	    if (done) {

		mscp->done = NULL;

		mscp->SCint->result = DID_ABORT << 16;

drivers/scsi/ultrastor.h

+7 −5
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ 


static int ultrastor_detect(struct scsi_host_template *);

static const char *ultrastor_info(struct Scsi_Host *shpnt);

static int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));

static int ultrastor_abort(Scsi_Cmnd *);

static int ultrastor_host_reset(Scsi_Cmnd *);

static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sector_t, int *);

static int ultrastor_queuecommand(struct scsi_cmnd *,

				void (*done)(struct scsi_cmnd *));

static int ultrastor_abort(struct scsi_cmnd *);

static int ultrastor_host_reset(struct scsi_cmnd *);

static int ultrastor_biosparam(struct scsi_device *, struct block_device *,

				sector_t, int *);





#define ULTRASTOR_14F_MAX_SG 16