scsi/aha1740: No longer use Scsi_Cmd typedef
PATCH 5/20 scsi/aha1740: No longer use Scsi_Cmd typedef
Change Scsi_Cmnd for struct scsi_cmnd.
Signed-off-by Davidlohr Bueso <[email protected]>
--- drivers/scsi/aha1740.c | 8 ++++---- drivers/scsi/aha1740.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/aha1740.c +4 -4
@@ -226,11 +226,11 @@ static int aha1740_test_port(unsigned int base)static irqreturn_t aha1740_intr_handle (int irq,void *dev_id) {struct Scsi_Host *host = (struct Scsi_Host *) dev_id; -void (*my_done)(Scsi_Cmnd *); +void (*my_done)(struct scsi_cmnd *);int errstatus, adapstat;int number_serviced;struct ecb *ecbptr; -Scsi_Cmnd *SCtmp; +struct scsi_cmnd *SCtmp;unsigned int base;unsigned long flags;int handled =0 ;
@@ -330,7 +330,7 @@ static irqreturn_t aha1740_intr_handle(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static int aha1740_queuecommand (Scsi_Cmnd * SCpnt,void (*done)(Scsi_Cmnd *)) +static int aha1740_queuecommand (struct scsi_cmnd * SCpnt,void (*done)(struct scsi_cmnd *)) {unchar direction;unchar *cmd = (unchar *) SCpnt->cmnd;
@@ -537,7 +537,7 @@ static int aha1740_biosparam(struct scsi_device *sdev,return 0 ; } -static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy) +static int aha1740_eh_abort_handler (struct scsi_cmnd *dummy) {/* * From Alan Cox :
drivers/scsi/aha1740.h +2 -2
@@ -134,8 +134,8 @@ struct ecb { /* Enhanced Control Block 6.1 *//* Hardware defined portion ends here, rest is driver defined */ u8 sense[MAX_SENSE ];/* Sense area */ u8 status[MAX_STATUS ];/* Status area */ -Scsi_Cmnd *SCpnt;/* Link to the SCSI Command Block */ -void (*done) (Scsi_Cmnd *);/* Completion Function */ +struct scsi_cmnd *SCpnt;/* Link to the SCSI Command Block */ +void (*done) (struct scsi_cmnd *);/* Completion Function */ };#define AHA1740CMD_NOP 0x00/* No OP */