Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755493AbZKHU1D (ORCPT ); Sun, 8 Nov 2009 15:27:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755454AbZKHU1A (ORCPT ); Sun, 8 Nov 2009 15:27:00 -0500 Received: from [190.108.161.231] ([190.108.161.231]:40539 "EHLO localhost.localdomain" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1755377AbZKHU06 convert rfc822-to-8bit (ORCPT ); Sun, 8 Nov 2009 15:26:58 -0500 Subject: [PATCH 13/20] scsi/ibmmca: No longer use Scsi_Cmd typedef From: Davidlohr Bueso Reply-To: dave@gnu.org To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, langa2@kph.uni-mainz.de Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Date: Sun, 08 Nov 2009 17:17:21 -0300 Message-ID: <1257711441.4759.119.camel@dbueso-pc> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4664 Lines: 127 Change Scsi_Cmnd for struct scsi_cmnd. Signed-off-by: Davidlohr Bueso --- drivers/scsi/ibmmca.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 9c1e6a5..5c09f32 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c @@ -39,9 +39,9 @@ #include /* Common forward declarations for all Linux-versions: */ -static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); -static int ibmmca_abort (Scsi_Cmnd *); -static int ibmmca_host_reset (Scsi_Cmnd *); +static int ibmmca_queuecommand (struct scsi_cmnd *, void (*done) (struct scsi_cmnd *)); +static int ibmmca_abort (struct scsi_cmnd *); +static int ibmmca_host_reset (struct scsi_cmnd *); static int ibmmca_biosparam (struct scsi_device *, struct block_device *, sector_t, int *); static int ibmmca_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start, off_t offset, int length, int inout); @@ -315,7 +315,7 @@ struct logical_device { struct im_tsb tsb; /* SCSI command complete status block structure */ struct im_sge sge[16]; /* scatter gather list structure */ unsigned char buf[256]; /* SCSI command return data buffer */ - Scsi_Cmnd *cmd; /* SCSI-command that is currently in progress */ + struct scsi_cmnd *cmd; /* SCSI-command that is currently in progress */ int device_type; /* type of the SCSI-device. See include/scsi/scsi.h for interpretation of the possible values */ int block_length; /* blocksize of a particular logical SCSI-device */ @@ -476,7 +476,7 @@ static char ibm_ansi_order = 0; #endif static void issue_cmd(struct Scsi_Host *, unsigned long, unsigned char); -static void internal_done(Scsi_Cmnd * cmd); +static void internal_done(struct scsi_cmnd * cmd); static void check_devices(struct Scsi_Host *, int); static int immediate_assign(struct Scsi_Host *, unsigned int, unsigned int, unsigned int, unsigned int); static int immediate_feature(struct Scsi_Host *, unsigned int, unsigned int); @@ -503,7 +503,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) unsigned int cmd_result; unsigned int ldn; unsigned long flags; - Scsi_Cmnd *cmd; + struct scsi_cmnd *cmd; int lastSCSI; struct device *dev = dev_id; struct Scsi_Host *shpnt = dev_get_drvdata(dev); @@ -726,7 +726,7 @@ static void issue_cmd(struct Scsi_Host *shpnt, unsigned long cmd_reg, spin_unlock_irqrestore(shpnt->host_lock, flags); } -static void internal_done(Scsi_Cmnd * cmd) +static void internal_done(struct scsi_cmnd * cmd) { cmd->SCp.Status++; return; @@ -1691,7 +1691,7 @@ static int __devexit ibmmca_remove(struct device *dev) } /* The following routine is the SCSI command queue for the midlevel driver */ -static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) +static int ibmmca_queuecommand(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *)) { unsigned int ldn; unsigned int scsi_cmd; @@ -1996,7 +1996,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) return 0; } -static int __ibmmca_abort(Scsi_Cmnd * cmd) +static int __ibmmca_abort(struct scsi_cmnd * cmd) { /* Abort does not work, as the adapter never generates an interrupt on * whatever situation is simulated, even when really pending commands @@ -2004,7 +2004,7 @@ static int __ibmmca_abort(Scsi_Cmnd * cmd) struct Scsi_Host *shpnt; unsigned int ldn; - void (*saved_done) (Scsi_Cmnd *); + void (*saved_done) (struct scsi_cmnd *); int target; int max_pun; unsigned long imm_command; @@ -2090,7 +2090,7 @@ static int __ibmmca_abort(Scsi_Cmnd * cmd) } } -static int ibmmca_abort(Scsi_Cmnd * cmd) +static int ibmmca_abort(struct scsi_cmnd * cmd) { struct Scsi_Host *shpnt = cmd->device->host; int rc; @@ -2102,10 +2102,10 @@ static int ibmmca_abort(Scsi_Cmnd * cmd) return rc; } -static int __ibmmca_host_reset(Scsi_Cmnd * cmd) +static int __ibmmca_host_reset(struct scsi_cmnd * cmd) { struct Scsi_Host *shpnt; - Scsi_Cmnd *cmd_aid; + struct scsi_cmnd *cmd_aid; int ticks, i; unsigned long imm_command; @@ -2182,7 +2182,7 @@ static int __ibmmca_host_reset(Scsi_Cmnd * cmd) return SUCCESS; } -static int ibmmca_host_reset(Scsi_Cmnd * cmd) +static int ibmmca_host_reset(struct scsi_cmnd * cmd) { struct Scsi_Host *shpnt = cmd->device->host; int rc; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/