Skip to contentSkip to conversation

scsi-driver ultrastore replace Scsi_Cmnd with struct scsi_cmnd

PATCH In review Henne 2 participants 3 messages Sep 6, 2006 – Sep 20, 2006 SCSI

lore
Share & tools
lore

Henne

author
#0 lore raw

PATCH 1/1 scsi-driver ultrastore replace Scsi_Cmnd with struct scsi_cmnd

From: Henrik Kretzschmar <[email protected]>

Replaces the typedef'd Scsi_Cmnd with struct scsi_cmnd.

---

drivers/scsi/ultrastor.c +2 -2
@@ -196,8 +196,8 @@
  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 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 @@

    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 @@
	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 @@

*/

-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 @@
    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 @@
    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 @@
    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 @@
	    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 +0 -0
@@ -14,11 +14,13 @@

#define _ULTRASTOR_H

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 const char *ultrastor_info(struct Scsi_Host *shpnt);
+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

#1 lore raw
Quoted 4 lines · Henne

From: Henrik Kretzschmar <[email protected]>

Replaces the typedef'd Scsi_Cmnd with struct scsi_cmnd.

Looks good to me. It would be even better if you could update the driver to not require

	#include "scsi.h"

anymore and get rid of ultrastor.h. Also your mailer unfortunately damages tabs.

author
#2 lore raw
Quoted 5 lines
Quoted 4 lines

On Wed, Sept 06, 2006 at 10:49:48AM +0200, Henne wrote:From: Henrik Kretzschmar <[email protected]>

Replaces the typedef'd Scsi_Cmnd with struct scsi_cmnd.

Quoted 7 lines

Looks good to me. It would be even better if you could update the driver to not require

	#include "scsi.h"

anymore and get rid of ultrastor.h. Also your mailer unfortunately damages tabs.

Sure, thats the big goal for all scsi drivers,but I decided to do one step after another.
I think it would be better to remove Scsi_Cmnd first to remove drivers/scsi/scsi_typedefs.h
first and then make the drivers use the headers in include/scsi/.
This is imho clearer to have one target per patch.
1. - change Scsi_Cmnd to struct scsi_cmnd
remove scsi_typedefs.h from drivers/scsi/scsi.h
remove scsi_typedefs.h from the tree
2. - put the local headers into c files if only used
by the driver itself (maybe delete unneeded prototypes or reorder the functions that no prototypes are needed)
3. - switch over to include/scsi/

Thats is my opinion.

Quoted 1 line

Also your mailer unfortunately damages tabs.

No, it doesn't. Even if it thunderbird. :)
ultrastor.h uses 4 spaces as intention and I just forgot to replace the with a tab. Thanks.
But I'm still looking for an easy standalone commandline smtp-engine to send my patches. Any suggestions?

Greets,
Henne