diff options
| author | Henrik Kretzschmar | 2006-09-15 18:50:34 +0200 |
|---|---|---|
| committer | James Bottomley | 2006-09-26 18:23:17 +0200 |
| commit | d7694f8c0bb61829b1bd4d5543a51c66f04a6c3e (patch) | |
| tree | 465aa9f213226af84f08ad3ca2bb6ed50fdc1436 /drivers/scsi/seagate.c | |
| parent | [SCSI] qla1280 command timeout (diff) | |
| download | kernel-qcow2-linux-d7694f8c0bb61829b1bd4d5543a51c66f04a6c3e.tar.gz kernel-qcow2-linux-d7694f8c0bb61829b1bd4d5543a51c66f04a6c3e.tar.xz kernel-qcow2-linux-d7694f8c0bb61829b1bd4d5543a51c66f04a6c3e.zip | |
[SCSI] seagate: remove header and convert to struct scsi_cmnd
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/seagate.c')
| -rw-r--r-- | drivers/scsi/seagate.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c index 2679ea8bff1a..e8f146d361c6 100644 --- a/drivers/scsi/seagate.c +++ b/drivers/scsi/seagate.c @@ -106,7 +106,6 @@ #include "scsi.h" #include <scsi/scsi_dbg.h> #include <scsi/scsi_host.h> -#include "seagate.h" #include <scsi/scsi_ioctl.h> @@ -322,6 +321,7 @@ static Signature __initdata signatures[] = { static int hostno = -1; static void seagate_reconnect_intr (int, void *, struct pt_regs *); static irqreturn_t do_seagate_reconnect_intr (int, void *, struct pt_regs *); +static int seagate_st0x_bus_reset(struct scsi_cmnd *); #ifdef FAST static int fast = 1; @@ -585,8 +585,8 @@ static int linked_connected = 0; static unsigned char linked_target, linked_lun; #endif -static void (*done_fn) (Scsi_Cmnd *) = NULL; -static Scsi_Cmnd *SCint = NULL; +static void (*done_fn) (struct scsi_cmnd *) = NULL; +static struct scsi_cmnd *SCint = NULL; /* * These control whether or not disconnect / reconnect will be attempted, @@ -633,7 +633,7 @@ static irqreturn_t do_seagate_reconnect_intr(int irq, void *dev_id, static void seagate_reconnect_intr (int irq, void *dev_id, struct pt_regs *regs) { int temp; - Scsi_Cmnd *SCtmp; + struct scsi_cmnd *SCtmp; DPRINTK (PHASE_RESELECT, "scsi%d : seagate_reconnect_intr() called\n", hostno); @@ -675,10 +675,11 @@ static void seagate_reconnect_intr (int irq, void *dev_id, struct pt_regs *regs) static int recursion_depth = 0; -static int seagate_st0x_queue_command (Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *)) +static int seagate_st0x_queue_command(struct scsi_cmnd * SCpnt, + void (*done) (struct scsi_cmnd *)) { int result, reconnect; - Scsi_Cmnd *SCtmp; + struct scsi_cmnd *SCtmp; DANY ("seagate: que_command"); done_fn = done; @@ -1609,7 +1610,7 @@ connect_loop: return retcode (st0x_aborted); } /* end of internal_command */ -static int seagate_st0x_abort (Scsi_Cmnd * SCpnt) +static int seagate_st0x_abort(struct scsi_cmnd * SCpnt) { st0x_aborted = DID_ABORT; return SUCCESS; @@ -1624,7 +1625,7 @@ static int seagate_st0x_abort (Scsi_Cmnd * SCpnt) * May be called with SCpnt = NULL */ -static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt) +static int seagate_st0x_bus_reset(struct scsi_cmnd * SCpnt) { /* No timeouts - this command is going to fail because it was reset. */ DANY ("scsi%d: Reseting bus... ", hostno); |