mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[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>
This commit is contained in:
Henrik Kretzschmar 2006-09-15 18:50:34 +02:00 committed by James Bottomley
parent 15d1f53fc7
commit d7694f8c0b
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/Kconfig
View File

@ -1260,8 +1260,8 @@ config SCSI_SEAGATE
These are 8-bit SCSI controllers; the ST-01 is also supported by These are 8-bit SCSI controllers; the ST-01 is also supported by
this driver. It is explained in section 3.9 of the SCSI-HOWTO, this driver. It is explained in section 3.9 of the SCSI-HOWTO,
available from <http://www.tldp.org/docs.html#howto>. If it available from <http://www.tldp.org/docs.html#howto>. If it
doesn't work out of the box, you may have to change some settings in doesn't work out of the box, you may have to change some macros at
<file:drivers/scsi/seagate.h>. compiletime, which are described in <file:drivers/scsi/seagate.c>.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called seagate. module will be called seagate.

17
drivers/scsi/seagate.c
View File

@ -106,7 +106,6 @@
#include "scsi.h" #include "scsi.h"
#include <scsi/scsi_dbg.h> #include <scsi/scsi_dbg.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include "seagate.h"
#include <scsi/scsi_ioctl.h> #include <scsi/scsi_ioctl.h>
@ -322,6 +321,7 @@ static Signature __initdata signatures[] = {
static int hostno = -1; static int hostno = -1;
static void seagate_reconnect_intr (int, void *, struct pt_regs *); static void seagate_reconnect_intr (int, void *, struct pt_regs *);
static irqreturn_t do_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 #ifdef FAST
static int fast = 1; static int fast = 1;
@ -585,8 +585,8 @@ static int linked_connected = 0;
static unsigned char linked_target, linked_lun; static unsigned char linked_target, linked_lun;
#endif #endif
static void (*done_fn) (Scsi_Cmnd *) = NULL; static void (*done_fn) (struct scsi_cmnd *) = NULL;
static Scsi_Cmnd *SCint = NULL; static struct scsi_cmnd *SCint = NULL;
/* /*
* These control whether or not disconnect / reconnect will be attempted, * 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) static void seagate_reconnect_intr (int irq, void *dev_id, struct pt_regs *regs)
{ {
int temp; int temp;
Scsi_Cmnd *SCtmp; struct scsi_cmnd *SCtmp;
DPRINTK (PHASE_RESELECT, "scsi%d : seagate_reconnect_intr() called\n", hostno); 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 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; int result, reconnect;
Scsi_Cmnd *SCtmp; struct scsi_cmnd *SCtmp;
DANY ("seagate: que_command"); DANY ("seagate: que_command");
done_fn = done; done_fn = done;
@ -1609,7 +1610,7 @@ connect_loop:
return retcode (st0x_aborted); return retcode (st0x_aborted);
} /* end of internal_command */ } /* 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; st0x_aborted = DID_ABORT;
return SUCCESS; return SUCCESS;
@ -1624,7 +1625,7 @@ static int seagate_st0x_abort (Scsi_Cmnd * SCpnt)
* May be called with SCpnt = NULL * 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. */ /* No timeouts - this command is going to fail because it was reset. */
DANY ("scsi%d: Reseting bus... ", hostno); DANY ("scsi%d: Reseting bus... ", hostno);

19
drivers/scsi/seagate.h
View File

@ -1,19 +0,0 @@
/*
* seagate.h Copyright (C) 1992 Drew Eckhardt
* low level scsi driver header for ST01/ST02 by
* Drew Eckhardt
*
* <drew@colorado.edu>
*/
#ifndef _SEAGATE_H
#define SEAGATE_H
static int seagate_st0x_detect(struct scsi_host_template *);
static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int seagate_st0x_abort(Scsi_Cmnd *);
static const char *seagate_st0x_info(struct Scsi_Host *);
static int seagate_st0x_bus_reset(Scsi_Cmnd *);
#endif /* _SEAGATE_H */