The patch titled
scsi: Scsi_Cmnd conversion in psi240i driver
has been added to the -mm tree. Its filename is
scsi-scsi_cmnd-convertion-in-psi240i-driver.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: Scsi_Cmnd conversion in psi240i driver
From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in psi240i-driver.
Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/psi240i.c | 31 ++++++++++++++++++-------------
drivers/scsi/psi240i.h | 6 +++---
2 files changed, 21 insertions(+), 16 deletions(-)
diff -puN drivers/scsi/psi240i.c~scsi-scsi_cmnd-convertion-in-psi240i-driver drivers/scsi/psi240i.c
--- a/drivers/scsi/psi240i.c~scsi-scsi_cmnd-convertion-in-psi240i-driver
+++ a/drivers/scsi/psi240i.c
@@ -87,11 +87,11 @@ typedef struct
{
USHORT ports[13];
OUR_DEVICE device[8];
- Scsi_Cmnd *pSCmnd;
+ struct scsi_cmnd *pSCmnd;
IDE_STRUCT ide;
ULONG startSector;
USHORT sectorCount;
- Scsi_Cmnd *SCpnt;
+ struct scsi_cmnd *SCpnt;
VOID *buffer;
USHORT expectingIRQ;
} ADAPTER240I, *PADAPTER240I;
@@ -254,12 +254,12 @@ static ULONG DecodeError (struct Scsi_Ho
****************************************************************/
static void Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
{
- struct Scsi_Host *shost; // Pointer to host data block
- PADAPTER240I padapter; // Pointer to adapter control structure
- USHORT *pports; // I/O port array
- Scsi_Cmnd *SCpnt;
- UCHAR status;
- int z;
+ struct Scsi_Host *shost; // Pointer to host data block
+ PADAPTER240I padapter; // Pointer to adapter control structure
+ USHORT *pports; // I/O port array
+ struct scsi_cmnd *SCpnt;
+ UCHAR status;
+ int z;
DEB(printk ("\npsi240i received interrupt\n"));
@@ -390,12 +390,17 @@ static irqreturn_t do_Irq_Handler (int i
* Returns: Status code.
*
****************************************************************/
-static int Psi240i_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
+static int Psi240i_QueueCommand(struct scsi_cmnd *SCpnt,
+ void (*done)(struct scsi_cmnd *))
{
- UCHAR *cdb = (UCHAR *)SCpnt->cmnd; // Pointer to SCSI CDB
- PADAPTER240I padapter = HOSTDATA (SCpnt->device->host); // Pointer to adapter control structure
- POUR_DEVICE pdev = &padapter->device [SCpnt->device->id];// Pointer to device information
- UCHAR rc; // command return code
+ UCHAR *cdb = (UCHAR *)SCpnt->cmnd;
+ // Pointer to SCSI CDB
+ PADAPTER240I padapter = HOSTDATA (SCpnt->device->host);
+ // Pointer to adapter control structure
+ POUR_DEVICE pdev = &padapter->device [SCpnt->device->id];
+ // Pointer to device information
+ UCHAR rc;
+ // command return code
SCpnt->scsi_done = done;
padapter->ide.ide.ides.spigot = pdev->spigot;
diff -puN drivers/scsi/psi240i.h~scsi-scsi_cmnd-convertion-in-psi240i-driver drivers/scsi/psi240i.h
--- a/drivers/scsi/psi240i.h~scsi-scsi_cmnd-convertion-in-psi240i-driver
+++ a/drivers/scsi/psi240i.h
@@ -309,7 +309,7 @@ typedef struct _IDENTIFY_DATA2 {
#endif // PSI_EIDE_SCSIOP
// function prototypes
-int Psi240i_Command (Scsi_Cmnd *SCpnt);
-int Psi240i_Abort (Scsi_Cmnd *SCpnt);
-int Psi240i_Reset (Scsi_Cmnd *SCpnt, unsigned int flags);
+int Psi240i_Command(struct scsi_cmnd *SCpnt);
+int Psi240i_Abort(struct scsi_cmnd *SCpnt);
+int Psi240i_Reset(struct scsi_cmnd *SCpnt, unsigned int flags);
#endif
_
Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are
origin.patch
git-scsi-misc.patch
scsi-convert-ninja-driver-to-struct-scsi_cmnd.patch
scsi-convertion-to-struct-scsi_cmnd-in-ips-driver.patch
fc4-conversion-to-struct-scsi_cmnd-in-fc4.patch
scsi-scsi_cmnd-convertion-in-sun3-driver.patch
scsi-scsi_cmnd-conversion-in-qlogicfas408-driver.patch
scsi-scsi_cmnd-convertion-in-psi240i-driver.patch
scsi-scsi_cmnd-convertion-in-arm-subtree.patch
mm-fix-in-kerneldoc.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
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
