The patch titled
scsi: seagate Scsi_Cmnd conversion
has been added to the -mm tree. Its filename is
scsi-seagate-scsi_cmnd-conversion.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: scsi: seagate Scsi_Cmnd conversion
From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Changes the obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd.
Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/seagate.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff -puN drivers/scsi/seagate.c~scsi-seagate-scsi_cmnd-conversion drivers/scsi/seagate.c
--- a/drivers/scsi/seagate.c~scsi-seagate-scsi_cmnd-conversion
+++ a/drivers/scsi/seagate.c
@@ -321,7 +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(Scsi_Cmnd *);
+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_
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
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
* 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);
_
Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are
git-libata-all.patch
kerneldoc-error-on-ata_piixc.patch
git-netdev-all.patch
git-net.patch
git-scsi-misc.patch
pci_module_init-conversion-in-scsi-subsys-2nd-try.patch
scsi-remove-seagateh.patch
scsi-seagate-scsi_cmnd-conversion.patch
gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure-2.patch
docbook-fix-segfault-in-docprocc.patch
pci_module_init-convertion-in-ata_genericc.patch
pci_module_init-convertion-in-ata_genericc-fix.patch
pci_module_init-convertion-in-amso1100-driver.patch
pci_module_init-convertion-for-k8_edacc.patch
pci_module_init-convertion-in-the-legacy-megaraid-driver.patch
nozomi-pci_module_init-conversion.patch
pci_module_init-convertion-in-olympicc.patch
pci_module_init-conversion-for-pata_pdc2027x.patch
pci_module_init-convertion-in-tmscsimc.patch
mark-pci_module_init-deprecated.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
