From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965000Ab1GOGUT (ORCPT ); Fri, 15 Jul 2011 02:20:19 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:44080 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964856Ab1GOGUP (ORCPT ); Fri, 15 Jul 2011 02:20:15 -0400 Subject: [PATCH 03/16] SCSI: Atari: remove Scsi_Cmnd From: Davidlohr Bueso Reply-To: dave@gnu.org To: James Bottomley , linux-scsi Cc: lkml Content-Type: text/plain; charset="UTF-8" Organization: GNU Date: Fri, 15 Jul 2011 02:19:48 -0400 Message-ID: <1310710788.3184.54.camel@offbook> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Davidlohr Bueso Change this for struct scsi_cmnd. Signed-off-by: Davidlohr Bueso --- drivers/scsi/atari_scsi.c | 10 +++++----- drivers/scsi/atari_scsi.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index 3e8658e..132445c 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c @@ -189,9 +189,9 @@ static inline void DISABLE_IRQ(void) static int scsi_dma_is_ignored_buserr(unsigned char dma_stat); static void atari_scsi_fetch_restbytes(void); static long atari_scsi_dma_residual(struct Scsi_Host *instance); -static int falcon_classify_cmd(Scsi_Cmnd *cmd); +static int falcon_classify_cmd(struct scsi_cmnd *cmd); static unsigned long atari_dma_xfer_len(unsigned long wanted_len, - Scsi_Cmnd *cmd, int write_flag); + struct scsi_cmnd *cmd, int write_flag); #endif static irqreturn_t scsi_tt_intr(int irq, void *dummy); static irqreturn_t scsi_falcon_intr(int irq, void *dummy); @@ -778,7 +778,7 @@ void __init atari_scsi_setup(char *str, int *ints) #endif } -int atari_scsi_bus_reset(Scsi_Cmnd *cmd) +int atari_scsi_bus_reset(struct scsi_cmnd *cmd) { int rv; struct NCR5380_hostdata *hostdata = @@ -938,7 +938,7 @@ static long atari_scsi_dma_residual(struct Scsi_Host *instance) #define CMD_SURELY_BYTE_MODE 1 #define CMD_MODE_UNKNOWN 2 -static int falcon_classify_cmd(Scsi_Cmnd *cmd) +static int falcon_classify_cmd(struct scsi_cmnd *cmd) { unsigned char opcode = cmd->cmnd[0]; @@ -970,7 +970,7 @@ static int falcon_classify_cmd(Scsi_Cmnd *cmd) */ static unsigned long atari_dma_xfer_len(unsigned long wanted_len, - Scsi_Cmnd *cmd, int write_flag) + struct scsi_cmnd *cmd, int write_flag) { unsigned long possible_len, limit; diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h index efadb8d..48c1e46 100644 --- a/drivers/scsi/atari_scsi.h +++ b/drivers/scsi/atari_scsi.h @@ -20,7 +20,7 @@ #ifndef ASM int atari_scsi_detect (struct scsi_host_template *); const char *atari_scsi_info (struct Scsi_Host *); -int atari_scsi_reset (Scsi_Cmnd *, unsigned int); +int atari_scsi_reset (struct scsi_cmnd *, unsigned int); int atari_scsi_release (struct Scsi_Host *); /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher -- 1.7.4.1