[PATCH 4/5] mvme147: Scsi_Cmnd to struct scsi_cmnd convertion

[PATCH 4/5] mvme147: Scsi_Cmnd to struct scsi_cmnd convertion

[Henne]

From: Henrik Kretzschmar <henne@nachtwindheim.de>

Changes obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>

---

diff -ruN linux-2.6/drivers/scsi/mvme147.c devel/drivers/scsi/mvme147.c
--- linux-2.6/drivers/scsi/mvme147.c	2006-08-01 01:31:43.000000000 +0200
+++ devel/drivers/scsi/mvme147.c	2006-09-12 20:13:20.000000000 +0200
@@ -29,7 +29,7 @@
     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 @@
     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 @@
     return 0;
 }
 
-static int mvme147_bus_reset(Scsi_Cmnd *cmd)
+static int mvme147_bus_reset(struct scsi_cmnd *cmd)
 {
 	/* FIXME perform bus-specific reset */
 
diff -ruN linux-2.6/drivers/scsi/mvme147.h devel/drivers/scsi/mvme147.h
--- linux-2.6/drivers/scsi/mvme147.h	2006-08-01 01:31:43.000000000 +0200
+++ devel/drivers/scsi/mvme147.h	2006-09-12 20:10:18.000000000 +0200
@@ -13,9 +13,9 @@
 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);
+int wd33c93_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *));
+int wd33c93_abort(struct scsi_cmnd *);
+int wd33c93_reset(struct scsi_cmnd *, unsigned int);
 
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN 2

Re: [PATCH 4/5] mvme147: Scsi_Cmnd to struct scsi_cmnd convertion

[James Bottomley]

On Tue, 2006-09-12 at 20:31 +0200, Henne wrote:
> Changes obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd.
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>

Actually, just a single patch for all the coupled drivers would be
better, please.

> -int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
> -int wd33c93_abort(Scsi_Cmnd *);
> -int wd33c93_reset(Scsi_Cmnd *, unsigned int);
> +int wd33c93_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *));
> +int wd33c93_abort(struct scsi_cmnd *);
> +int wd33c93_reset(struct scsi_cmnd *, unsigned int);

These prototypes are all unnecessary and can be pulled out of the
individual header files.  The first two are provided by wd33c93.h and
the last one isn't actually in the body of any file.

wd33c93_info is also unused and can go.

Thanks,

James