diff for duplicates of <20141002065632.096154014@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index 7765851..1dce8ef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,930 +1,3 @@ -Convert Scsi_Cmnd to struct scsi_cmnd and drop the #include "scsi.h". -The sun3_NCR5380.c core driver already uses struct scsi_cmnd so converting -the other core drivers reduces the diff which makes them easier to unify. - -Signed-off-by: Finn Thain <fthain@telegraphics.com.au> - ---- - -Line length issues have not been addressed here because comparison of the -three core drivers (NCR5380.c, atari_NCR5380.c and sun3_NCR5380.c) becomes -too messy. These lines get shorter once the type casting is fixed (work in -progress). - ---- - drivers/scsi/NCR5380.c | 70 +++++++++++++++-------------- - drivers/scsi/NCR5380.h | 10 ++-- - drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/arm/oak.c | 1 - drivers/scsi/atari_NCR5380.c | 102 +++++++++++++++++++++---------------------- - drivers/scsi/atari_scsi.c | 5 -- - drivers/scsi/dmx3191d.c | 1 - drivers/scsi/dtc.c | 1 - drivers/scsi/g_NCR5380.c | 1 - drivers/scsi/mac_scsi.c | 1 - drivers/scsi/pas16.c | 1 - drivers/scsi/sun3_NCR5380.c | 20 ++++---- - drivers/scsi/sun3_scsi.c | 1 - drivers/scsi/t128.c | 1 - 14 files changed, 105 insertions(+), 111 deletions(-) - -Index: linux/drivers/scsi/NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/NCR5380.c 2014-10-02 16:56:14.000000000 +1000 -@@ -277,7 +277,7 @@ static void do_reset(struct Scsi_Host *h - * Set up the internal fields in the SCSI command. - */ - --static __inline__ void initialize_SCp(Scsi_Cmnd * cmd) -+static inline void initialize_SCp(struct scsi_cmnd *cmd) - { - /* - * Initialize the Scsi Pointer field so that all of the commands in the -@@ -720,7 +720,7 @@ static int __maybe_unused NCR5380_write_ - #undef SPRINTF - #define SPRINTF(args...) seq_printf(m, ## args) - static --void lprint_Scsi_Cmnd(Scsi_Cmnd * cmd, struct seq_file *m); -+void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m); - static - void lprint_command(unsigned char *cmd, struct seq_file *m); - static -@@ -730,7 +730,7 @@ static int __maybe_unused NCR5380_show_i - struct Scsi_Host *instance) - { - struct NCR5380_hostdata *hostdata; -- Scsi_Cmnd *ptr; -+ struct scsi_cmnd *ptr; - - hostdata = (struct NCR5380_hostdata *) instance->hostdata; - -@@ -742,19 +742,19 @@ static int __maybe_unused NCR5380_show_i - if (!hostdata->connected) - SPRINTF("scsi%d: no currently connected command\n", instance->host_no); - else -- lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m); -+ lprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m); - SPRINTF("scsi%d: issue_queue\n", instance->host_no); -- for (ptr = (Scsi_Cmnd *) hostdata->issue_queue; ptr; ptr = (Scsi_Cmnd *) ptr->host_scribble) -+ for (ptr = (struct scsi_cmnd *) hostdata->issue_queue; ptr; ptr = (struct scsi_cmnd *) ptr->host_scribble) - lprint_Scsi_Cmnd(ptr, m); - - SPRINTF("scsi%d: disconnected_queue\n", instance->host_no); -- for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; ptr = (Scsi_Cmnd *) ptr->host_scribble) -+ for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; ptr = (struct scsi_cmnd *) ptr->host_scribble) - lprint_Scsi_Cmnd(ptr, m); - spin_unlock_irq(instance->host_lock); - return 0; - } - --static void lprint_Scsi_Cmnd(Scsi_Cmnd * cmd, struct seq_file *m) -+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m) - { - SPRINTF("scsi%d : destination target %d, lun %d\n", cmd->device->host->host_no, cmd->device->id, cmd->device->lun); - SPRINTF(" command = "); -@@ -913,11 +913,11 @@ static void NCR5380_exit(struct Scsi_Hos - * Locks: host lock taken by caller - */ - --static int NCR5380_queue_command_lck(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) -+static int NCR5380_queue_command_lck(struct scsi_cmnd *cmd, void (*done) (struct scsi_cmnd *)) - { - struct Scsi_Host *instance = cmd->device->host; - struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; -- Scsi_Cmnd *tmp; -+ struct scsi_cmnd *tmp; - - #if (NDEBUG & NDEBUG_NO_WRITE) - switch (cmd->cmnd[0]) { -@@ -951,7 +951,7 @@ static int NCR5380_queue_command_lck(Scs - cmd->host_scribble = (unsigned char *) hostdata->issue_queue; - hostdata->issue_queue = cmd; - } else { -- for (tmp = (Scsi_Cmnd *) hostdata->issue_queue; tmp->host_scribble; tmp = (Scsi_Cmnd *) tmp->host_scribble); -+ for (tmp = (struct scsi_cmnd *) hostdata->issue_queue; tmp->host_scribble; tmp = (struct scsi_cmnd *) tmp->host_scribble); - LIST(cmd, tmp); - tmp->host_scribble = (unsigned char *) cmd; - } -@@ -982,7 +982,7 @@ static void NCR5380_main(struct work_str - struct NCR5380_hostdata *hostdata = - container_of(work, struct NCR5380_hostdata, coroutine.work); - struct Scsi_Host *instance = hostdata->host; -- Scsi_Cmnd *tmp, *prev; -+ struct scsi_cmnd *tmp, *prev; - int done; - - spin_lock_irq(instance->host_lock); -@@ -995,7 +995,7 @@ static void NCR5380_main(struct work_str - * Search through the issue_queue for a command destined - * for a target that's not busy. - */ -- for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble) -+ for (tmp = (struct scsi_cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (struct scsi_cmnd *) tmp->host_scribble) - { - if (prev != tmp) - dprintk(NDEBUG_LISTS, "MAIN tmp=%p target=%d busy=%d lun=%d\n", tmp, tmp->device->id, hostdata->busy[tmp->device->id], tmp->device->lun); -@@ -1006,7 +1006,7 @@ static void NCR5380_main(struct work_str - prev->host_scribble = tmp->host_scribble; - } else { - REMOVE(-1, hostdata->issue_queue, tmp, tmp->host_scribble); -- hostdata->issue_queue = (Scsi_Cmnd *) tmp->host_scribble; -+ hostdata->issue_queue = (struct scsi_cmnd *) tmp->host_scribble; - } - tmp->host_scribble = NULL; - -@@ -1053,7 +1053,7 @@ static void NCR5380_main(struct work_str - /* exited locked */ - } /* if (!hostdata->connected) */ - if (hostdata->selecting) { -- tmp = (Scsi_Cmnd *) hostdata->selecting; -+ tmp = (struct scsi_cmnd *) hostdata->selecting; - /* Selection will drop and retake the lock */ - if (!NCR5380_select(instance, tmp)) { - /* Ok ?? */ -@@ -1175,7 +1175,8 @@ static irqreturn_t NCR5380_intr(int dumm - #endif - - /* -- * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd) -+ * Function : int NCR5380_select(struct Scsi_Host *instance, -+ * struct scsi_cmnd *cmd) - * - * Purpose : establishes I_T_L or I_T_L_Q nexus for new or existing command, - * including ARBITRATION, SELECTION, and initial message out for -@@ -1204,7 +1205,7 @@ static irqreturn_t NCR5380_intr(int dumm - * Locks: caller holds hostdata lock in IRQ mode - */ - --static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd) -+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) - { - NCR5380_local_declare(); - struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; -@@ -2011,7 +2012,7 @@ static void NCR5380_information_transfer - #endif - unsigned char *data; - unsigned char phase, tmp, extended_msg[10], old_phase = 0xff; -- Scsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected; -+ struct scsi_cmnd *cmd = (struct scsi_cmnd *) hostdata->connected; - /* RvC: we need to set the end of the polling time */ - unsigned long poll_time = jiffies + USLEEP_POLL; - -@@ -2201,7 +2202,7 @@ static void NCR5380_information_transfer - LIST(cmd, hostdata->issue_queue); - cmd->host_scribble = (unsigned char *) - hostdata->issue_queue; -- hostdata->issue_queue = (Scsi_Cmnd *) cmd; -+ hostdata->issue_queue = (struct scsi_cmnd *) cmd; - dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no); - } else { - cmd->scsi_done(cmd); -@@ -2398,7 +2399,7 @@ static void NCR5380_information_transfer - * Function : void NCR5380_reselect (struct Scsi_Host *instance) - * - * Purpose : does reselection, initializing the instance->connected -- * field to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q -+ * field to point to the scsi_cmnd for which the I_T_L or I_T_L_Q - * nexus has been reestablished, - * - * Inputs : instance - this instance of the NCR5380. -@@ -2415,7 +2416,7 @@ static void NCR5380_reselect(struct Scsi - int len; - unsigned char msg[3]; - unsigned char *data; -- Scsi_Cmnd *tmp = NULL, *prev; -+ struct scsi_cmnd *tmp = NULL, *prev; - int abort = 0; - NCR5380_setup(instance); - -@@ -2481,7 +2482,7 @@ static void NCR5380_reselect(struct Scsi - */ - - -- for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble) -+ for (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue, prev = NULL; tmp; prev = tmp, tmp = (struct scsi_cmnd *) tmp->host_scribble) - if ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun) - ) { - if (prev) { -@@ -2489,7 +2490,7 @@ static void NCR5380_reselect(struct Scsi - prev->host_scribble = tmp->host_scribble; - } else { - REMOVE(-1, hostdata->disconnected_queue, tmp, tmp->host_scribble); -- hostdata->disconnected_queue = (Scsi_Cmnd *) tmp->host_scribble; -+ hostdata->disconnected_queue = (struct scsi_cmnd *) tmp->host_scribble; - } - tmp->host_scribble = NULL; - break; -@@ -2520,7 +2521,7 @@ static void NCR5380_reselect(struct Scsi - * - * Inputs : instance - this instance of the NCR5380. - * -- * Returns : pointer to the Scsi_Cmnd structure for which the I_T_L -+ * Returns : pointer to the scsi_cmnd structure for which the I_T_L - * nexus has been reestablished, on failure NULL is returned. - */ - -@@ -2562,11 +2563,11 @@ static void NCR5380_dma_complete(NCR5380 - #endif /* def REAL_DMA */ - - /* -- * Function : int NCR5380_abort (Scsi_Cmnd *cmd) -+ * Function : int NCR5380_abort (struct scsi_cmnd *cmd) - * - * Purpose : abort a command - * -- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the -+ * Inputs : cmd - the scsi_cmnd to abort, code - code to set the - * host byte of the result field to, if zero DID_ABORTED is - * used. - * -@@ -2580,11 +2581,12 @@ static void NCR5380_dma_complete(NCR5380 - * Locks: host lock taken by caller - */ - --static int NCR5380_abort(Scsi_Cmnd * cmd) { -+static int NCR5380_abort(struct scsi_cmnd *cmd) -+{ - NCR5380_local_declare(); - struct Scsi_Host *instance = cmd->device->host; - struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; -- Scsi_Cmnd *tmp, **prev; -+ struct scsi_cmnd *tmp, **prev; - - printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no); - scsi_print_command(cmd); -@@ -2633,10 +2635,10 @@ static int NCR5380_abort(Scsi_Cmnd * cmd - */ - - dprintk(NDEBUG_ABORT, "scsi%d : abort going into loop.\n", instance->host_no); -- for (prev = (Scsi_Cmnd **) & (hostdata->issue_queue), tmp = (Scsi_Cmnd *) hostdata->issue_queue; tmp; prev = (Scsi_Cmnd **) & (tmp->host_scribble), tmp = (Scsi_Cmnd *) tmp->host_scribble) -+ for (prev = (struct scsi_cmnd **) &(hostdata->issue_queue), tmp = (struct scsi_cmnd *) hostdata->issue_queue; tmp; prev = (struct scsi_cmnd **) &(tmp->host_scribble), tmp = (struct scsi_cmnd *) tmp->host_scribble) - if (cmd == tmp) { - REMOVE(5, *prev, tmp, tmp->host_scribble); -- (*prev) = (Scsi_Cmnd *) tmp->host_scribble; -+ (*prev) = (struct scsi_cmnd *) tmp->host_scribble; - tmp->host_scribble = NULL; - tmp->result = DID_ABORT << 16; - dprintk(NDEBUG_ABORT, "scsi%d : abort removed command from issue queue.\n", instance->host_no); -@@ -2689,7 +2691,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd - * it from the disconnected queue. - */ - -- for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; tmp = (Scsi_Cmnd *) tmp->host_scribble) -+ for (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp; tmp = (struct scsi_cmnd *) tmp->host_scribble) - if (cmd == tmp) { - dprintk(NDEBUG_ABORT, "scsi%d : aborting disconnected command.\n", instance->host_no); - -@@ -2699,10 +2701,10 @@ static int NCR5380_abort(Scsi_Cmnd * cmd - - do_abort(instance); - -- for (prev = (Scsi_Cmnd **) & (hostdata->disconnected_queue), tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; prev = (Scsi_Cmnd **) & (tmp->host_scribble), tmp = (Scsi_Cmnd *) tmp->host_scribble) -+ for (prev = (struct scsi_cmnd **) &(hostdata->disconnected_queue), tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp; prev = (struct scsi_cmnd **) &(tmp->host_scribble), tmp = (struct scsi_cmnd *) tmp->host_scribble) - if (cmd == tmp) { - REMOVE(5, *prev, tmp, tmp->host_scribble); -- *prev = (Scsi_Cmnd *) tmp->host_scribble; -+ *prev = (struct scsi_cmnd *) tmp->host_scribble; - tmp->host_scribble = NULL; - tmp->result = DID_ABORT << 16; - tmp->scsi_done(tmp); -@@ -2725,7 +2727,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd - - - /* -- * Function : int NCR5380_bus_reset (Scsi_Cmnd *cmd) -+ * Function : int NCR5380_bus_reset (struct scsi_cmnd *cmd) - * - * Purpose : reset the SCSI bus. - * -@@ -2734,7 +2736,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd - * Locks: host lock taken by caller - */ - --static int NCR5380_bus_reset(Scsi_Cmnd * cmd) -+static int NCR5380_bus_reset(struct scsi_cmnd *cmd) - { - struct Scsi_Host *instance = cmd->device->host; - -Index: linux/drivers/scsi/NCR5380.h -=================================================================== ---- linux.orig/drivers/scsi/NCR5380.h 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/NCR5380.h 2014-10-02 16:56:14.000000000 +1000 -@@ -251,9 +251,9 @@ struct NCR5380_hostdata { - volatile int dma_len; /* requested length of DMA */ - #endif - volatile unsigned char last_message; /* last message OUT */ -- volatile Scsi_Cmnd *connected; /* currently connected command */ -- volatile Scsi_Cmnd *issue_queue; /* waiting to be issued */ -- volatile Scsi_Cmnd *disconnected_queue; /* waiting for reconnect */ -+ volatile struct scsi_cmnd *connected; /* currently connected command */ -+ volatile struct scsi_cmnd *issue_queue; /* waiting to be issued */ -+ volatile struct scsi_cmnd *disconnected_queue; /* waiting for reconnect */ - volatile int restart_select; /* we have disconnected, - used to restart - NCR5380_select() */ -@@ -261,7 +261,7 @@ struct NCR5380_hostdata { - int flags; - unsigned long time_expires; /* in jiffies, set prior to sleeping */ - int select_time; /* timer in select for target response */ -- volatile Scsi_Cmnd *selecting; -+ volatile struct scsi_cmnd *selecting; - struct delayed_work coroutine; /* our co-routine */ - struct scsi_eh_save ses; - char info[256]; -@@ -305,7 +305,7 @@ static irqreturn_t NCR5380_intr(int irq, - static void NCR5380_main(struct work_struct *work); - static const char *NCR5380_info(struct Scsi_Host *instance); - static void NCR5380_reselect(struct Scsi_Host *instance); --static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd); -+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd); - #if defined(PSEUDO_DMA) || defined(REAL_DMA) || defined(REAL_DMA_POLL) - static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data); - #endif -Index: linux/drivers/scsi/arm/cumana_1.c -=================================================================== ---- linux.orig/drivers/scsi/arm/cumana_1.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/arm/cumana_1.c 2014-10-02 16:56:14.000000000 +1000 -@@ -13,7 +13,6 @@ - #include <asm/ecard.h> - #include <asm/io.h> - --#include "../scsi.h" - #include <scsi/scsi_host.h> - - #include <scsi/scsicam.h> -Index: linux/drivers/scsi/arm/oak.c -=================================================================== ---- linux.orig/drivers/scsi/arm/oak.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/arm/oak.c 2014-10-02 16:56:14.000000000 +1000 -@@ -14,7 +14,6 @@ - #include <asm/ecard.h> - #include <asm/io.h> - --#include "../scsi.h" - #include <scsi/scsi_host.h> - - /*#define PSEUDO_DMA*/ -Index: linux/drivers/scsi/atari_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/atari_NCR5380.c 2014-10-02 16:56:14.000000000 +1000 -@@ -262,9 +262,9 @@ static struct scsi_host_template *the_te - (struct NCR5380_hostdata *)(in)->hostdata - #define HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata) - --#define NEXT(cmd) ((Scsi_Cmnd *)(cmd)->host_scribble) -+#define NEXT(cmd) ((struct scsi_cmnd *)(cmd)->host_scribble) - #define SET_NEXT(cmd,next) ((cmd)->host_scribble = (void *)(next)) --#define NEXTADDR(cmd) ((Scsi_Cmnd **)&(cmd)->host_scribble) -+#define NEXTADDR(cmd) ((struct scsi_cmnd **)&(cmd)->host_scribble) - - #define HOSTNO instance->host_no - #define H_NO(cmd) (cmd)->device->host->host_no -@@ -345,7 +345,7 @@ static void __init init_tags(void) - * conditions. - */ - --static int is_lun_busy(Scsi_Cmnd *cmd, int should_be_tagged) -+static int is_lun_busy(struct scsi_cmnd *cmd, int should_be_tagged) - { - SETUP_HOSTDATA(cmd->device->host); - -@@ -369,7 +369,7 @@ static int is_lun_busy(Scsi_Cmnd *cmd, i - * untagged. - */ - --static void cmd_get_tag(Scsi_Cmnd *cmd, int should_be_tagged) -+static void cmd_get_tag(struct scsi_cmnd *cmd, int should_be_tagged) - { - SETUP_HOSTDATA(cmd->device->host); - -@@ -400,7 +400,7 @@ static void cmd_get_tag(Scsi_Cmnd *cmd, - * unlock the LUN. - */ - --static void cmd_free_tag(Scsi_Cmnd *cmd) -+static void cmd_free_tag(struct scsi_cmnd *cmd) - { - SETUP_HOSTDATA(cmd->device->host); - -@@ -442,18 +442,18 @@ static void free_all_tags(void) - - - /* -- * Function: void merge_contiguous_buffers( Scsi_Cmnd *cmd ) -+ * Function: void merge_contiguous_buffers( struct scsi_cmnd *cmd ) - * - * Purpose: Try to merge several scatter-gather requests into one DMA - * transfer. This is possible if the scatter buffers lie on - * physical contiguous addresses. - * -- * Parameters: Scsi_Cmnd *cmd -+ * Parameters: struct scsi_cmnd *cmd - * The command to work on. The first scatter buffer's data are - * assumed to be already transferred into ptr/this_residual. - */ - --static void merge_contiguous_buffers(Scsi_Cmnd *cmd) -+static void merge_contiguous_buffers(struct scsi_cmnd *cmd) - { - unsigned long endaddr; - #if (NDEBUG & NDEBUG_MERGING) -@@ -482,15 +482,15 @@ static void merge_contiguous_buffers(Scs - } - - /* -- * Function : void initialize_SCp(Scsi_Cmnd *cmd) -+ * Function : void initialize_SCp(struct scsi_cmnd *cmd) - * - * Purpose : initialize the saved data pointers for cmd to point to the - * start of the buffer. - * -- * Inputs : cmd - Scsi_Cmnd structure to have pointers reset. -+ * Inputs : cmd - scsi_cmnd structure to have pointers reset. - */ - --static inline void initialize_SCp(Scsi_Cmnd *cmd) -+static inline void initialize_SCp(struct scsi_cmnd *cmd) - { - /* - * Initialize the Scsi Pointer field so that all of the commands in the -@@ -712,7 +712,7 @@ static void prepare_info(struct Scsi_Hos - * Inputs : instance, pointer to this instance. - */ - --static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd) -+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd) - { - int i, s; - unsigned char *command; -@@ -729,7 +729,7 @@ static void lprint_Scsi_Cmnd(Scsi_Cmnd * - static void NCR5380_print_status(struct Scsi_Host *instance) - { - struct NCR5380_hostdata *hostdata; -- Scsi_Cmnd *ptr; -+ struct scsi_cmnd *ptr; - unsigned long flags; - - NCR5380_dprint(NDEBUG_ANY, instance); -@@ -743,13 +743,13 @@ static void NCR5380_print_status(struct - if (!hostdata->connected) - printk("scsi%d: no currently connected command\n", HOSTNO); - else -- lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected); -+ lprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected); - printk("scsi%d: issue_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) -+ for (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) - lprint_Scsi_Cmnd(ptr); - - printk("scsi%d: disconnected_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; -+ for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; - ptr = NEXT(ptr)) - lprint_Scsi_Cmnd(ptr); - -@@ -757,7 +757,7 @@ static void NCR5380_print_status(struct - printk("\n"); - } - --static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m) -+static void show_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m) - { - int i, s; - unsigned char *command; -@@ -775,7 +775,7 @@ static int __maybe_unused NCR5380_show_i - struct Scsi_Host *instance) - { - struct NCR5380_hostdata *hostdata; -- Scsi_Cmnd *ptr; -+ struct scsi_cmnd *ptr; - unsigned long flags; - - hostdata = (struct NCR5380_hostdata *)instance->hostdata; -@@ -786,13 +786,13 @@ static int __maybe_unused NCR5380_show_i - if (!hostdata->connected) - seq_printf(m, "scsi%d: no currently connected command\n", HOSTNO); - else -- show_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m); -+ show_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m); - seq_printf(m, "scsi%d: issue_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) -+ for (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) - show_Scsi_Cmnd(ptr, m); - - seq_printf(m, "scsi%d: disconnected_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; -+ for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; - ptr = NEXT(ptr)) - show_Scsi_Cmnd(ptr, m); - -@@ -860,8 +860,8 @@ static void NCR5380_exit(struct Scsi_Hos - } - - /* -- * Function : int NCR5380_queue_command (Scsi_Cmnd *cmd, -- * void (*done)(Scsi_Cmnd *)) -+ * Function : int NCR5380_queue_command (struct scsi_cmnd *cmd, -+ * void (*done)(struct scsi_cmnd *)) - * - * Purpose : enqueues a SCSI command - * -@@ -877,10 +877,11 @@ static void NCR5380_exit(struct Scsi_Hos - * - */ - --static int NCR5380_queue_command_lck(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) -+static int NCR5380_queue_command_lck(struct scsi_cmnd *cmd, -+ void (*done)(struct scsi_cmnd *)) - { - SETUP_HOSTDATA(cmd->device->host); -- Scsi_Cmnd *tmp; -+ struct scsi_cmnd *tmp; - unsigned long flags; - - #if (NDEBUG & NDEBUG_NO_WRITE) -@@ -935,7 +936,7 @@ static int NCR5380_queue_command_lck(Scs - SET_NEXT(cmd, hostdata->issue_queue); - hostdata->issue_queue = cmd; - } else { -- for (tmp = (Scsi_Cmnd *)hostdata->issue_queue; -+ for (tmp = (struct scsi_cmnd *)hostdata->issue_queue; - NEXT(tmp); tmp = NEXT(tmp)) - ; - LIST(cmd, tmp); -@@ -976,7 +977,7 @@ static DEF_SCSI_QCMD(NCR5380_queue_comma - - static void NCR5380_main(struct work_struct *work) - { -- Scsi_Cmnd *tmp, *prev; -+ struct scsi_cmnd *tmp, *prev; - struct Scsi_Host *instance = first_instance; - struct NCR5380_hostdata *hostdata = HOSTDATA(instance); - int done; -@@ -1019,7 +1020,7 @@ static void NCR5380_main(struct work_str - * for a target that's not busy. - */ - #if (NDEBUG & NDEBUG_LISTS) -- for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL; -+ for (tmp = (struct scsi_cmnd *) hostdata->issue_queue, prev = NULL; - tmp && (tmp != prev); prev = tmp, tmp = NEXT(tmp)) - ; - /*printk("%p ", tmp);*/ -@@ -1027,7 +1028,7 @@ static void NCR5380_main(struct work_str - printk(" LOOP\n"); - /* else printk("\n"); */ - #endif -- for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, -+ for (tmp = (struct scsi_cmnd *) hostdata->issue_queue, - prev = NULL; tmp; prev = tmp, tmp = NEXT(tmp)) { - - #if (NDEBUG & NDEBUG_LISTS) -@@ -1288,7 +1289,8 @@ static irqreturn_t NCR5380_intr(int irq, - } - - /* -- * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd) -+ * Function : int NCR5380_select(struct Scsi_Host *instance, -+ * struct scsi_cmnd *cmd) - * - * Purpose : establishes I_T_L or I_T_L_Q nexus for new or existing command, - * including ARBITRATION, SELECTION, and initial message out for -@@ -1315,7 +1317,7 @@ static irqreturn_t NCR5380_intr(int irq, - * cmd->result host byte set to DID_BAD_TARGET. - */ - --static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd) -+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) - { - SETUP_HOSTDATA(instance); - unsigned char tmp[3], phase; -@@ -1914,7 +1916,7 @@ static void NCR5380_information_transfer - #endif - unsigned char *data; - unsigned char phase, tmp, extended_msg[10], old_phase = 0xff; -- Scsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected; -+ struct scsi_cmnd *cmd = (struct scsi_cmnd *) hostdata->connected; - - while (1) { - tmp = NCR5380_read(STATUS_REG); -@@ -2151,7 +2153,7 @@ static void NCR5380_information_transfer - local_irq_save(flags); - LIST(cmd,hostdata->issue_queue); - SET_NEXT(cmd, hostdata->issue_queue); -- hostdata->issue_queue = (Scsi_Cmnd *) cmd; -+ hostdata->issue_queue = (struct scsi_cmnd *) cmd; - local_irq_restore(flags); - dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of " - "issue queue\n", H_NO(cmd)); -@@ -2375,7 +2377,7 @@ static void NCR5380_information_transfer - * Function : void NCR5380_reselect (struct Scsi_Host *instance) - * - * Purpose : does reselection, initializing the instance->connected -- * field to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q -+ * field to point to the scsi_cmnd for which the I_T_L or I_T_L_Q - * nexus has been reestablished, - * - * Inputs : instance - this instance of the NCR5380. -@@ -2394,7 +2396,7 @@ static void NCR5380_reselect(struct Scsi - #endif - unsigned char msg[3]; - unsigned char *data; -- Scsi_Cmnd *tmp = NULL, *prev; -+ struct scsi_cmnd *tmp = NULL, *prev; - /* unsigned long flags; */ - - /* -@@ -2468,7 +2470,7 @@ static void NCR5380_reselect(struct Scsi - * just reestablished, and remove it from the disconnected queue. - */ - -- for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL; -+ for (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue, prev = NULL; - tmp; prev = tmp, tmp = NEXT(tmp)) { - if ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun) - #ifdef SUPPORT_TAGS -@@ -2519,11 +2521,11 @@ static void NCR5380_reselect(struct Scsi - - - /* -- * Function : int NCR5380_abort (Scsi_Cmnd *cmd) -+ * Function : int NCR5380_abort (struct scsi_cmnd *cmd) - * - * Purpose : abort a command - * -- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the -+ * Inputs : cmd - the scsi_cmnd to abort, code - code to set the - * host byte of the result field to, if zero DID_ABORTED is - * used. - * -@@ -2536,11 +2538,11 @@ static void NCR5380_reselect(struct Scsi - */ - - static --int NCR5380_abort(Scsi_Cmnd *cmd) -+int NCR5380_abort(struct scsi_cmnd *cmd) - { - struct Scsi_Host *instance = cmd->device->host; - SETUP_HOSTDATA(instance); -- Scsi_Cmnd *tmp, **prev; -+ struct scsi_cmnd *tmp, **prev; - unsigned long flags; - - printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO); -@@ -2610,8 +2612,8 @@ int NCR5380_abort(Scsi_Cmnd *cmd) - * Case 2 : If the command hasn't been issued yet, we simply remove it - * from the issue queue. - */ -- for (prev = (Scsi_Cmnd **)&(hostdata->issue_queue), -- tmp = (Scsi_Cmnd *)hostdata->issue_queue; -+ for (prev = (struct scsi_cmnd **)&(hostdata->issue_queue), -+ tmp = (struct scsi_cmnd *)hostdata->issue_queue; - tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) { - if (cmd == tmp) { - REMOVE(5, *prev, tmp, NEXT(tmp)); -@@ -2671,7 +2673,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd) - * it from the disconnected queue. - */ - -- for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; -+ for (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp; - tmp = NEXT(tmp)) { - if (cmd == tmp) { - local_irq_restore(flags); -@@ -2685,8 +2687,8 @@ int NCR5380_abort(Scsi_Cmnd *cmd) - do_abort(instance); - - local_irq_save(flags); -- for (prev = (Scsi_Cmnd **)&(hostdata->disconnected_queue), -- tmp = (Scsi_Cmnd *)hostdata->disconnected_queue; -+ for (prev = (struct scsi_cmnd **)&(hostdata->disconnected_queue), -+ tmp = (struct scsi_cmnd *)hostdata->disconnected_queue; - tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) { - if (cmd == tmp) { - REMOVE(5, *prev, tmp, NEXT(tmp)); -@@ -2735,7 +2737,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd) - - - /* -- * Function : int NCR5380_reset (Scsi_Cmnd *cmd) -+ * Function : int NCR5380_reset (struct scsi_cmnd *cmd) - * - * Purpose : reset the SCSI bus. - * -@@ -2743,13 +2745,13 @@ int NCR5380_abort(Scsi_Cmnd *cmd) - * - */ - --static int NCR5380_bus_reset(Scsi_Cmnd *cmd) -+static int NCR5380_bus_reset(struct scsi_cmnd *cmd) - { - SETUP_HOSTDATA(cmd->device->host); - int i; - unsigned long flags; - #if defined(RESET_RUN_DONE) -- Scsi_Cmnd *connected, *disconnected_queue; -+ struct scsi_cmnd *connected, *disconnected_queue; - #endif - - if (!IS_A_TT() && !falcon_got_lock) -@@ -2791,9 +2793,9 @@ static int NCR5380_bus_reset(Scsi_Cmnd * - * remembered in local variables first. - */ - local_irq_save(flags); -- connected = (Scsi_Cmnd *)hostdata->connected; -+ connected = (struct scsi_cmnd *)hostdata->connected; - hostdata->connected = NULL; -- disconnected_queue = (Scsi_Cmnd *)hostdata->disconnected_queue; -+ disconnected_queue = (struct scsi_cmnd *)hostdata->disconnected_queue; - hostdata->disconnected_queue = NULL; - #ifdef SUPPORT_TAGS - free_all_tags(); -Index: linux/drivers/scsi/atari_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/atari_scsi.c 2014-10-02 16:56:10.000000000 +1000 -+++ linux/drivers/scsi/atari_scsi.c 2014-10-02 16:56:14.000000000 +1000 -@@ -93,7 +93,6 @@ - #include <asm/irq.h> - #include <asm/traps.h> - --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "atari_scsi.h" - #include "NCR5380.h" -@@ -880,7 +879,7 @@ static long atari_scsi_dma_residual(stru - #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]; - -@@ -912,7 +911,7 @@ static int falcon_classify_cmd(Scsi_Cmnd - */ - - 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; - -Index: linux/drivers/scsi/dmx3191d.c -=================================================================== ---- linux.orig/drivers/scsi/dmx3191d.c 2014-10-02 16:56:05.000000000 +1000 -+++ linux/drivers/scsi/dmx3191d.c 2014-10-02 16:56:14.000000000 +1000 -@@ -45,7 +45,6 @@ - * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h) - */ - #include <linux/delay.h> --#include "scsi.h" - - #include "NCR5380.h" - #include "NCR5380.c" -Index: linux/drivers/scsi/dtc.c -=================================================================== ---- linux.orig/drivers/scsi/dtc.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/dtc.c 2014-10-02 16:56:14.000000000 +1000 -@@ -58,7 +58,6 @@ - #include <linux/init.h> - #include <linux/interrupt.h> - #include <linux/io.h> --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "dtc.h" - #define AUTOPROBE_IRQ -Index: linux/drivers/scsi/g_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/g_NCR5380.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/g_NCR5380.c 2014-10-02 16:56:14.000000000 +1000 -@@ -72,7 +72,6 @@ - #include <asm/io.h> - #include <linux/signal.h> - #include <linux/blkdev.h> --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "g_NCR5380.h" - #include "NCR5380.h" -Index: linux/drivers/scsi/mac_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/mac_scsi.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/mac_scsi.c 2014-10-02 16:56:14.000000000 +1000 -@@ -30,7 +30,6 @@ - #include <asm/macints.h> - #include <asm/mac_via.h> - --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "mac_scsi.h" - -Index: linux/drivers/scsi/pas16.c -=================================================================== ---- linux.orig/drivers/scsi/pas16.c 2014-10-02 16:56:09.000000000 +1000 -+++ linux/drivers/scsi/pas16.c 2014-10-02 16:56:14.000000000 +1000 -@@ -81,7 +81,6 @@ - #include <linux/stat.h> - #include <linux/init.h> - --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "pas16.h" - #define AUTOPROBE_IRQ -Index: linux/drivers/scsi/sun3_NCR5380.c -=================================================================== ---- linux.orig/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/sun3_NCR5380.c 2014-10-02 16:56:14.000000000 +1000 -@@ -658,7 +658,7 @@ static void prepare_info(struct Scsi_Hos - * Inputs : instance, pointer to this instance. - */ - --static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd) -+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd) - { - int i, s; - unsigned char *command; -@@ -675,7 +675,7 @@ static void lprint_Scsi_Cmnd(Scsi_Cmnd * - static void NCR5380_print_status(struct Scsi_Host *instance) - { - struct NCR5380_hostdata *hostdata; -- Scsi_Cmnd *ptr; -+ struct scsi_cmnd *ptr; - unsigned long flags; - - NCR5380_dprint(NDEBUG_ANY, instance); -@@ -689,13 +689,13 @@ static void NCR5380_print_status(struct - if (!hostdata->connected) - printk("scsi%d: no currently connected command\n", HOSTNO); - else -- lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected); -+ lprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected); - printk("scsi%d: issue_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) -+ for (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) - lprint_Scsi_Cmnd(ptr); - - printk("scsi%d: disconnected_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; -+ for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; - ptr = NEXT(ptr)) - lprint_Scsi_Cmnd(ptr); - -@@ -703,7 +703,7 @@ static void NCR5380_print_status(struct - printk("\n"); - } - --static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m) -+static void show_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m) - { - int i, s; - unsigned char *command; -@@ -721,7 +721,7 @@ static int __maybe_unused NCR5380_show_i - struct Scsi_Host *instance) - { - struct NCR5380_hostdata *hostdata; -- Scsi_Cmnd *ptr; -+ struct scsi_cmnd *ptr; - unsigned long flags; - - hostdata = (struct NCR5380_hostdata *)instance->hostdata; -@@ -732,13 +732,13 @@ static int __maybe_unused NCR5380_show_i - if (!hostdata->connected) - seq_printf(m, "scsi%d: no currently connected command\n", HOSTNO); - else -- show_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m); -+ show_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m); - seq_printf(m, "scsi%d: issue_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) -+ for (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr)) - show_Scsi_Cmnd(ptr, m); - - seq_printf(m, "scsi%d: disconnected_queue\n", HOSTNO); -- for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; -+ for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; - ptr = NEXT(ptr)) - show_Scsi_Cmnd(ptr, m); - -Index: linux/drivers/scsi/sun3_scsi.c -=================================================================== ---- linux.orig/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/sun3_scsi.c 2014-10-02 16:56:14.000000000 +1000 -@@ -43,7 +43,6 @@ - /* dma on! */ - #define REAL_DMA - --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "sun3_scsi.h" - #include "NCR5380.h" -Index: linux/drivers/scsi/t128.c -=================================================================== ---- linux.orig/drivers/scsi/t128.c 2014-10-02 16:56:11.000000000 +1000 -+++ linux/drivers/scsi/t128.c 2014-10-02 16:56:14.000000000 +1000 -@@ -77,7 +77,6 @@ - #include <linux/module.h> - #include <linux/delay.h> - --#include "scsi.h" - #include <scsi/scsi_host.h> - #include "t128.h" - #define AUTOPROBE_IRQ +An embedded and charset-unspecified text was scrubbed... +Name: ncr5380-drop-legacy-scsi-h-include +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141002/af42c230/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index 80cbab2..1b0f626 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,946 +1,12 @@ "ref\020141002065628.256592712@telegraphics.com.au\0" - "From\0Finn Thain <fthain@telegraphics.com.au>\0" + "From\0fthain@telegraphics.com.au (Finn Thain)\0" "Subject\0[PATCH 16/29] ncr5380: Drop legacy scsi.h include\0" "Date\0Thu, 02 Oct 2014 16:56:44 +1000\0" - "To\0James E.J. Bottomley <JBottomley@parallels.com>\0" - "Cc\0Michael Schmitz <schmitzmic@gmail.com>" - Sam Creasey <sammy@sammy.net> - linux-scsi@vger.kernel.org - linux-m68k@vger.kernel.org - Russell King <linux@arm.linux.org.uk> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0ncr5380-drop-legacy-scsi-h-include\0" "b\0" - "Convert Scsi_Cmnd to struct scsi_cmnd and drop the #include \"scsi.h\".\n" - "The sun3_NCR5380.c core driver already uses struct scsi_cmnd so converting\n" - "the other core drivers reduces the diff which makes them easier to unify.\n" - "\n" - "Signed-off-by: Finn Thain <fthain@telegraphics.com.au>\n" - "\n" - "---\n" - "\n" - "Line length issues have not been addressed here because comparison of the\n" - "three core drivers (NCR5380.c, atari_NCR5380.c and sun3_NCR5380.c) becomes\n" - "too messy. These lines get shorter once the type casting is fixed (work in\n" - "progress).\n" - "\n" - "---\n" - " drivers/scsi/NCR5380.c | 70 +++++++++++++++--------------\n" - " drivers/scsi/NCR5380.h | 10 ++--\n" - " drivers/scsi/arm/cumana_1.c | 1 \n" - " drivers/scsi/arm/oak.c | 1 \n" - " drivers/scsi/atari_NCR5380.c | 102 +++++++++++++++++++++----------------------\n" - " drivers/scsi/atari_scsi.c | 5 --\n" - " drivers/scsi/dmx3191d.c | 1 \n" - " drivers/scsi/dtc.c | 1 \n" - " drivers/scsi/g_NCR5380.c | 1 \n" - " drivers/scsi/mac_scsi.c | 1 \n" - " drivers/scsi/pas16.c | 1 \n" - " drivers/scsi/sun3_NCR5380.c | 20 ++++----\n" - " drivers/scsi/sun3_scsi.c | 1 \n" - " drivers/scsi/t128.c | 1 \n" - " 14 files changed, 105 insertions(+), 111 deletions(-)\n" - "\n" - "Index: linux/drivers/scsi/NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/NCR5380.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -277,7 +277,7 @@ static void do_reset(struct Scsi_Host *h\n" - " *\tSet up the internal fields in the SCSI command.\n" - " */\n" - " \n" - "-static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)\n" - "+static inline void initialize_SCp(struct scsi_cmnd *cmd)\n" - " {\n" - " \t/* \n" - " \t * Initialize the Scsi Pointer field so that all of the commands in the \n" - "@@ -720,7 +720,7 @@ static int __maybe_unused NCR5380_write_\n" - " #undef SPRINTF\n" - " #define SPRINTF(args...) seq_printf(m, ## args)\n" - " static\n" - "-void lprint_Scsi_Cmnd(Scsi_Cmnd * cmd, struct seq_file *m);\n" - "+void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m);\n" - " static\n" - " void lprint_command(unsigned char *cmd, struct seq_file *m);\n" - " static\n" - "@@ -730,7 +730,7 @@ static int __maybe_unused NCR5380_show_i\n" - " \tstruct Scsi_Host *instance)\n" - " {\n" - " \tstruct NCR5380_hostdata *hostdata;\n" - "-\tScsi_Cmnd *ptr;\n" - "+\tstruct scsi_cmnd *ptr;\n" - " \n" - " \thostdata = (struct NCR5380_hostdata *) instance->hostdata;\n" - " \n" - "@@ -742,19 +742,19 @@ static int __maybe_unused NCR5380_show_i\n" - " \tif (!hostdata->connected)\n" - " \t\tSPRINTF(\"scsi%d: no currently connected command\\n\", instance->host_no);\n" - " \telse\n" - "-\t\tlprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m);\n" - "+\t\tlprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m);\n" - " \tSPRINTF(\"scsi%d: issue_queue\\n\", instance->host_no);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->issue_queue; ptr; ptr = (Scsi_Cmnd *) ptr->host_scribble)\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->issue_queue; ptr; ptr = (struct scsi_cmnd *) ptr->host_scribble)\n" - " \t\tlprint_Scsi_Cmnd(ptr, m);\n" - " \n" - " \tSPRINTF(\"scsi%d: disconnected_queue\\n\", instance->host_no);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr; ptr = (Scsi_Cmnd *) ptr->host_scribble)\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr; ptr = (struct scsi_cmnd *) ptr->host_scribble)\n" - " \t\tlprint_Scsi_Cmnd(ptr, m);\n" - " \tspin_unlock_irq(instance->host_lock);\n" - " \treturn 0;\n" - " }\n" - " \n" - "-static void lprint_Scsi_Cmnd(Scsi_Cmnd * cmd, struct seq_file *m)\n" - "+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m)\n" - " {\n" - " \tSPRINTF(\"scsi%d : destination target %d, lun %d\\n\", cmd->device->host->host_no, cmd->device->id, cmd->device->lun);\n" - " \tSPRINTF(\" command = \");\n" - "@@ -913,11 +913,11 @@ static void NCR5380_exit(struct Scsi_Hos\n" - " *\tLocks: host lock taken by caller\n" - " */\n" - " \n" - "-static int NCR5380_queue_command_lck(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))\n" - "+static int NCR5380_queue_command_lck(struct scsi_cmnd *cmd, void (*done) (struct scsi_cmnd *))\n" - " {\n" - " \tstruct Scsi_Host *instance = cmd->device->host;\n" - " \tstruct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;\n" - "-\tScsi_Cmnd *tmp;\n" - "+\tstruct scsi_cmnd *tmp;\n" - " \n" - " #if (NDEBUG & NDEBUG_NO_WRITE)\n" - " \tswitch (cmd->cmnd[0]) {\n" - "@@ -951,7 +951,7 @@ static int NCR5380_queue_command_lck(Scs\n" - " \t\tcmd->host_scribble = (unsigned char *) hostdata->issue_queue;\n" - " \t\thostdata->issue_queue = cmd;\n" - " \t} else {\n" - "-\t\tfor (tmp = (Scsi_Cmnd *) hostdata->issue_queue; tmp->host_scribble; tmp = (Scsi_Cmnd *) tmp->host_scribble);\n" - "+\t\tfor (tmp = (struct scsi_cmnd *) hostdata->issue_queue; tmp->host_scribble; tmp = (struct scsi_cmnd *) tmp->host_scribble);\n" - " \t\tLIST(cmd, tmp);\n" - " \t\ttmp->host_scribble = (unsigned char *) cmd;\n" - " \t}\n" - "@@ -982,7 +982,7 @@ static void NCR5380_main(struct work_str\n" - " \tstruct NCR5380_hostdata *hostdata =\n" - " \t\tcontainer_of(work, struct NCR5380_hostdata, coroutine.work);\n" - " \tstruct Scsi_Host *instance = hostdata->host;\n" - "-\tScsi_Cmnd *tmp, *prev;\n" - "+\tstruct scsi_cmnd *tmp, *prev;\n" - " \tint done;\n" - " \t\n" - " \tspin_lock_irq(instance->host_lock);\n" - "@@ -995,7 +995,7 @@ static void NCR5380_main(struct work_str\n" - " \t\t\t * Search through the issue_queue for a command destined\n" - " \t\t\t * for a target that's not busy.\n" - " \t\t\t */\n" - "-\t\t\tfor (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble) \n" - "+\t\t\tfor (tmp = (struct scsi_cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (struct scsi_cmnd *) tmp->host_scribble)\n" - " \t\t\t{\n" - " \t\t\t\tif (prev != tmp)\n" - " \t\t\t\t\tdprintk(NDEBUG_LISTS, \"MAIN tmp=%p target=%d busy=%d lun=%d\\n\", tmp, tmp->device->id, hostdata->busy[tmp->device->id], tmp->device->lun);\n" - "@@ -1006,7 +1006,7 @@ static void NCR5380_main(struct work_str\n" - " \t\t\t\t\t\tprev->host_scribble = tmp->host_scribble;\n" - " \t\t\t\t\t} else {\n" - " \t\t\t\t\t\tREMOVE(-1, hostdata->issue_queue, tmp, tmp->host_scribble);\n" - "-\t\t\t\t\t\thostdata->issue_queue = (Scsi_Cmnd *) tmp->host_scribble;\n" - "+\t\t\t\t\t\thostdata->issue_queue = (struct scsi_cmnd *) tmp->host_scribble;\n" - " \t\t\t\t\t}\n" - " \t\t\t\t\ttmp->host_scribble = NULL;\n" - " \n" - "@@ -1053,7 +1053,7 @@ static void NCR5380_main(struct work_str\n" - " \t\t\t/* exited locked */\n" - " \t\t}\t/* if (!hostdata->connected) */\n" - " \t\tif (hostdata->selecting) {\n" - "-\t\t\ttmp = (Scsi_Cmnd *) hostdata->selecting;\n" - "+\t\t\ttmp = (struct scsi_cmnd *) hostdata->selecting;\n" - " \t\t\t/* Selection will drop and retake the lock */\n" - " \t\t\tif (!NCR5380_select(instance, tmp)) {\n" - " \t\t\t\t/* Ok ?? */\n" - "@@ -1175,7 +1175,8 @@ static irqreturn_t NCR5380_intr(int dumm\n" - " #endif \n" - " \n" - " /* \n" - "- * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_select(struct Scsi_Host *instance,\n" - "+ * struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : establishes I_T_L or I_T_L_Q nexus for new or existing command,\n" - " * including ARBITRATION, SELECTION, and initial message out for \n" - "@@ -1204,7 +1205,7 @@ static irqreturn_t NCR5380_intr(int dumm\n" - " *\tLocks: caller holds hostdata lock in IRQ mode\n" - " */\n" - " \n" - "-static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd)\n" - "+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)\n" - " {\n" - " \tNCR5380_local_declare();\n" - " \tstruct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;\n" - "@@ -2011,7 +2012,7 @@ static void NCR5380_information_transfer\n" - " #endif\n" - " \tunsigned char *data;\n" - " \tunsigned char phase, tmp, extended_msg[10], old_phase = 0xff;\n" - "-\tScsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected;\n" - "+\tstruct scsi_cmnd *cmd = (struct scsi_cmnd *) hostdata->connected;\n" - " \t/* RvC: we need to set the end of the polling time */\n" - " \tunsigned long poll_time = jiffies + USLEEP_POLL;\n" - " \n" - "@@ -2201,7 +2202,7 @@ static void NCR5380_information_transfer\n" - " \t\t\t\t\t\tLIST(cmd, hostdata->issue_queue);\n" - " \t\t\t\t\t\tcmd->host_scribble = (unsigned char *)\n" - " \t\t\t\t\t\t hostdata->issue_queue;\n" - "-\t\t\t\t\t\thostdata->issue_queue = (Scsi_Cmnd *) cmd;\n" - "+\t\t\t\t\t\thostdata->issue_queue = (struct scsi_cmnd *) cmd;\n" - " \t\t\t\t\t\tdprintk(NDEBUG_QUEUES, \"scsi%d : REQUEST SENSE added to head of issue queue\\n\", instance->host_no);\n" - " \t\t\t\t\t} else {\n" - " \t\t\t\t\t\tcmd->scsi_done(cmd);\n" - "@@ -2398,7 +2399,7 @@ static void NCR5380_information_transfer\n" - " * Function : void NCR5380_reselect (struct Scsi_Host *instance)\n" - " *\n" - " * Purpose : does reselection, initializing the instance->connected \n" - "- * field to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q \n" - "+ * field to point to the scsi_cmnd for which the I_T_L or I_T_L_Q\n" - " * nexus has been reestablished,\n" - " * \n" - " * Inputs : instance - this instance of the NCR5380.\n" - "@@ -2415,7 +2416,7 @@ static void NCR5380_reselect(struct Scsi\n" - " \tint len;\n" - " \tunsigned char msg[3];\n" - " \tunsigned char *data;\n" - "-\tScsi_Cmnd *tmp = NULL, *prev;\n" - "+\tstruct scsi_cmnd *tmp = NULL, *prev;\n" - " \tint abort = 0;\n" - " \tNCR5380_setup(instance);\n" - " \n" - "@@ -2481,7 +2482,7 @@ static void NCR5380_reselect(struct Scsi\n" - " \t\t */\n" - " \n" - " \n" - "-\t\tfor (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble)\n" - "+\t\tfor (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue, prev = NULL; tmp; prev = tmp, tmp = (struct scsi_cmnd *) tmp->host_scribble)\n" - " \t\t\tif ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun)\n" - " \t\t\t ) {\n" - " \t\t\t\tif (prev) {\n" - "@@ -2489,7 +2490,7 @@ static void NCR5380_reselect(struct Scsi\n" - " \t\t\t\t\tprev->host_scribble = tmp->host_scribble;\n" - " \t\t\t\t} else {\n" - " \t\t\t\t\tREMOVE(-1, hostdata->disconnected_queue, tmp, tmp->host_scribble);\n" - "-\t\t\t\t\thostdata->disconnected_queue = (Scsi_Cmnd *) tmp->host_scribble;\n" - "+\t\t\t\t\thostdata->disconnected_queue = (struct scsi_cmnd *) tmp->host_scribble;\n" - " \t\t\t\t}\n" - " \t\t\t\ttmp->host_scribble = NULL;\n" - " \t\t\t\tbreak;\n" - "@@ -2520,7 +2521,7 @@ static void NCR5380_reselect(struct Scsi\n" - " *\n" - " * Inputs : instance - this instance of the NCR5380.\n" - " *\n" - "- * Returns : pointer to the Scsi_Cmnd structure for which the I_T_L\n" - "+ * Returns : pointer to the scsi_cmnd structure for which the I_T_L\n" - " * nexus has been reestablished, on failure NULL is returned.\n" - " */\n" - " \n" - "@@ -2562,11 +2563,11 @@ static void NCR5380_dma_complete(NCR5380\n" - " #endif\t\t\t\t/* def REAL_DMA */\n" - " \n" - " /*\n" - "- * Function : int NCR5380_abort (Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_abort (struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : abort a command\n" - " *\n" - "- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the \n" - "+ * Inputs : cmd - the scsi_cmnd to abort, code - code to set the\n" - " * host byte of the result field to, if zero DID_ABORTED is \n" - " * used.\n" - " *\n" - "@@ -2580,11 +2581,12 @@ static void NCR5380_dma_complete(NCR5380\n" - " * Locks: host lock taken by caller\n" - " */\n" - " \n" - "-static int NCR5380_abort(Scsi_Cmnd * cmd) {\n" - "+static int NCR5380_abort(struct scsi_cmnd *cmd)\n" - "+{\n" - " \tNCR5380_local_declare();\n" - " \tstruct Scsi_Host *instance = cmd->device->host;\n" - " \tstruct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;\n" - "-\tScsi_Cmnd *tmp, **prev;\n" - "+\tstruct scsi_cmnd *tmp, **prev;\n" - " \t\n" - " \tprintk(KERN_WARNING \"scsi%d : aborting command\\n\", instance->host_no);\n" - " \tscsi_print_command(cmd);\n" - "@@ -2633,10 +2635,10 @@ static int NCR5380_abort(Scsi_Cmnd * cmd\n" - " */\n" - " \n" - " \tdprintk(NDEBUG_ABORT, \"scsi%d : abort going into loop.\\n\", instance->host_no);\n" - "-\tfor (prev = (Scsi_Cmnd **) & (hostdata->issue_queue), tmp = (Scsi_Cmnd *) hostdata->issue_queue; tmp; prev = (Scsi_Cmnd **) & (tmp->host_scribble), tmp = (Scsi_Cmnd *) tmp->host_scribble)\n" - "+\tfor (prev = (struct scsi_cmnd **) &(hostdata->issue_queue), tmp = (struct scsi_cmnd *) hostdata->issue_queue; tmp; prev = (struct scsi_cmnd **) &(tmp->host_scribble), tmp = (struct scsi_cmnd *) tmp->host_scribble)\n" - " \t\tif (cmd == tmp) {\n" - " \t\t\tREMOVE(5, *prev, tmp, tmp->host_scribble);\n" - "-\t\t\t(*prev) = (Scsi_Cmnd *) tmp->host_scribble;\n" - "+\t\t\t(*prev) = (struct scsi_cmnd *) tmp->host_scribble;\n" - " \t\t\ttmp->host_scribble = NULL;\n" - " \t\t\ttmp->result = DID_ABORT << 16;\n" - " \t\t\tdprintk(NDEBUG_ABORT, \"scsi%d : abort removed command from issue queue.\\n\", instance->host_no);\n" - "@@ -2689,7 +2691,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd\n" - " * it from the disconnected queue.\n" - " */\n" - " \n" - "-\tfor (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; tmp = (Scsi_Cmnd *) tmp->host_scribble)\n" - "+\tfor (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp; tmp = (struct scsi_cmnd *) tmp->host_scribble)\n" - " \t\tif (cmd == tmp) {\n" - " \t\t\tdprintk(NDEBUG_ABORT, \"scsi%d : aborting disconnected command.\\n\", instance->host_no);\n" - " \n" - "@@ -2699,10 +2701,10 @@ static int NCR5380_abort(Scsi_Cmnd * cmd\n" - " \n" - " \t\t\tdo_abort(instance);\n" - " \n" - "-\t\t\tfor (prev = (Scsi_Cmnd **) & (hostdata->disconnected_queue), tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; prev = (Scsi_Cmnd **) & (tmp->host_scribble), tmp = (Scsi_Cmnd *) tmp->host_scribble)\n" - "+\t\t\tfor (prev = (struct scsi_cmnd **) &(hostdata->disconnected_queue), tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp; prev = (struct scsi_cmnd **) &(tmp->host_scribble), tmp = (struct scsi_cmnd *) tmp->host_scribble)\n" - " \t\t\t\tif (cmd == tmp) {\n" - " \t\t\t\t\tREMOVE(5, *prev, tmp, tmp->host_scribble);\n" - "-\t\t\t\t\t*prev = (Scsi_Cmnd *) tmp->host_scribble;\n" - "+\t\t\t\t\t*prev = (struct scsi_cmnd *) tmp->host_scribble;\n" - " \t\t\t\t\ttmp->host_scribble = NULL;\n" - " \t\t\t\t\ttmp->result = DID_ABORT << 16;\n" - " \t\t\t\t\ttmp->scsi_done(tmp);\n" - "@@ -2725,7 +2727,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd\n" - " \n" - " \n" - " /* \n" - "- * Function : int NCR5380_bus_reset (Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_bus_reset (struct scsi_cmnd *cmd)\n" - " * \n" - " * Purpose : reset the SCSI bus.\n" - " *\n" - "@@ -2734,7 +2736,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd\n" - " * Locks: host lock taken by caller\n" - " */\n" - " \n" - "-static int NCR5380_bus_reset(Scsi_Cmnd * cmd)\n" - "+static int NCR5380_bus_reset(struct scsi_cmnd *cmd)\n" - " {\n" - " \tstruct Scsi_Host *instance = cmd->device->host;\n" - " \n" - "Index: linux/drivers/scsi/NCR5380.h\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/NCR5380.h\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/NCR5380.h\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -251,9 +251,9 @@ struct NCR5380_hostdata {\n" - " \tvolatile int dma_len;\t\t\t/* requested length of DMA */\n" - " #endif\n" - " \tvolatile unsigned char last_message;\t/* last message OUT */\n" - "-\tvolatile Scsi_Cmnd *connected;\t\t/* currently connected command */\n" - "-\tvolatile Scsi_Cmnd *issue_queue;\t/* waiting to be issued */\n" - "-\tvolatile Scsi_Cmnd *disconnected_queue;\t/* waiting for reconnect */\n" - "+\tvolatile struct scsi_cmnd *connected;\t/* currently connected command */\n" - "+\tvolatile struct scsi_cmnd *issue_queue;\t/* waiting to be issued */\n" - "+\tvolatile struct scsi_cmnd *disconnected_queue;\t/* waiting for reconnect */\n" - " \tvolatile int restart_select;\t\t/* we have disconnected,\n" - " \t\t\t\t\t\t used to restart \n" - " \t\t\t\t\t\t NCR5380_select() */\n" - "@@ -261,7 +261,7 @@ struct NCR5380_hostdata {\n" - " \tint flags;\n" - " \tunsigned long time_expires;\t\t/* in jiffies, set prior to sleeping */\n" - " \tint select_time;\t\t\t/* timer in select for target response */\n" - "-\tvolatile Scsi_Cmnd *selecting;\n" - "+\tvolatile struct scsi_cmnd *selecting;\n" - " \tstruct delayed_work coroutine;\t\t/* our co-routine */\n" - " \tstruct scsi_eh_save ses;\n" - " \tchar info[256];\n" - "@@ -305,7 +305,7 @@ static irqreturn_t NCR5380_intr(int irq,\n" - " static void NCR5380_main(struct work_struct *work);\n" - " static const char *NCR5380_info(struct Scsi_Host *instance);\n" - " static void NCR5380_reselect(struct Scsi_Host *instance);\n" - "-static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd);\n" - "+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd);\n" - " #if defined(PSEUDO_DMA) || defined(REAL_DMA) || defined(REAL_DMA_POLL)\n" - " static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data);\n" - " #endif\n" - "Index: linux/drivers/scsi/arm/cumana_1.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/cumana_1.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/arm/cumana_1.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -13,7 +13,6 @@\n" - " #include <asm/ecard.h>\n" - " #include <asm/io.h>\n" - " \n" - "-#include \"../scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " \n" - " #include <scsi/scsicam.h>\n" - "Index: linux/drivers/scsi/arm/oak.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/arm/oak.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/arm/oak.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -14,7 +14,6 @@\n" - " #include <asm/ecard.h>\n" - " #include <asm/io.h>\n" - " \n" - "-#include \"../scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " \n" - " /*#define PSEUDO_DMA*/\n" - "Index: linux/drivers/scsi/atari_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/atari_NCR5380.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/atari_NCR5380.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -262,9 +262,9 @@ static struct scsi_host_template *the_te\n" - " \t(struct NCR5380_hostdata *)(in)->hostdata\n" - " #define\tHOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata)\n" - " \n" - "-#define\tNEXT(cmd)\t\t((Scsi_Cmnd *)(cmd)->host_scribble)\n" - "+#define\tNEXT(cmd)\t\t((struct scsi_cmnd *)(cmd)->host_scribble)\n" - " #define\tSET_NEXT(cmd,next)\t((cmd)->host_scribble = (void *)(next))\n" - "-#define\tNEXTADDR(cmd)\t\t((Scsi_Cmnd **)&(cmd)->host_scribble)\n" - "+#define\tNEXTADDR(cmd)\t\t((struct scsi_cmnd **)&(cmd)->host_scribble)\n" - " \n" - " #define\tHOSTNO\t\tinstance->host_no\n" - " #define\tH_NO(cmd)\t(cmd)->device->host->host_no\n" - "@@ -345,7 +345,7 @@ static void __init init_tags(void)\n" - " * conditions.\n" - " */\n" - " \n" - "-static int is_lun_busy(Scsi_Cmnd *cmd, int should_be_tagged)\n" - "+static int is_lun_busy(struct scsi_cmnd *cmd, int should_be_tagged)\n" - " {\n" - " \tSETUP_HOSTDATA(cmd->device->host);\n" - " \n" - "@@ -369,7 +369,7 @@ static int is_lun_busy(Scsi_Cmnd *cmd, i\n" - " * untagged.\n" - " */\n" - " \n" - "-static void cmd_get_tag(Scsi_Cmnd *cmd, int should_be_tagged)\n" - "+static void cmd_get_tag(struct scsi_cmnd *cmd, int should_be_tagged)\n" - " {\n" - " \tSETUP_HOSTDATA(cmd->device->host);\n" - " \n" - "@@ -400,7 +400,7 @@ static void cmd_get_tag(Scsi_Cmnd *cmd,\n" - " * unlock the LUN.\n" - " */\n" - " \n" - "-static void cmd_free_tag(Scsi_Cmnd *cmd)\n" - "+static void cmd_free_tag(struct scsi_cmnd *cmd)\n" - " {\n" - " \tSETUP_HOSTDATA(cmd->device->host);\n" - " \n" - "@@ -442,18 +442,18 @@ static void free_all_tags(void)\n" - " \n" - " \n" - " /*\n" - "- * Function: void merge_contiguous_buffers( Scsi_Cmnd *cmd )\n" - "+ * Function: void merge_contiguous_buffers( struct scsi_cmnd *cmd )\n" - " *\n" - " * Purpose: Try to merge several scatter-gather requests into one DMA\n" - " * transfer. This is possible if the scatter buffers lie on\n" - " * physical contiguous addresses.\n" - " *\n" - "- * Parameters: Scsi_Cmnd *cmd\n" - "+ * Parameters: struct scsi_cmnd *cmd\n" - " * The command to work on. The first scatter buffer's data are\n" - " * assumed to be already transferred into ptr/this_residual.\n" - " */\n" - " \n" - "-static void merge_contiguous_buffers(Scsi_Cmnd *cmd)\n" - "+static void merge_contiguous_buffers(struct scsi_cmnd *cmd)\n" - " {\n" - " \tunsigned long endaddr;\n" - " #if (NDEBUG & NDEBUG_MERGING)\n" - "@@ -482,15 +482,15 @@ static void merge_contiguous_buffers(Scs\n" - " }\n" - " \n" - " /*\n" - "- * Function : void initialize_SCp(Scsi_Cmnd *cmd)\n" - "+ * Function : void initialize_SCp(struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : initialize the saved data pointers for cmd to point to the\n" - " *\tstart of the buffer.\n" - " *\n" - "- * Inputs : cmd - Scsi_Cmnd structure to have pointers reset.\n" - "+ * Inputs : cmd - scsi_cmnd structure to have pointers reset.\n" - " */\n" - " \n" - "-static inline void initialize_SCp(Scsi_Cmnd *cmd)\n" - "+static inline void initialize_SCp(struct scsi_cmnd *cmd)\n" - " {\n" - " \t/*\n" - " \t * Initialize the Scsi Pointer field so that all of the commands in the\n" - "@@ -712,7 +712,7 @@ static void prepare_info(struct Scsi_Hos\n" - " * Inputs : instance, pointer to this instance.\n" - " */\n" - " \n" - "-static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd)\n" - "+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd)\n" - " {\n" - " \tint i, s;\n" - " \tunsigned char *command;\n" - "@@ -729,7 +729,7 @@ static void lprint_Scsi_Cmnd(Scsi_Cmnd *\n" - " static void NCR5380_print_status(struct Scsi_Host *instance)\n" - " {\n" - " \tstruct NCR5380_hostdata *hostdata;\n" - "-\tScsi_Cmnd *ptr;\n" - "+\tstruct scsi_cmnd *ptr;\n" - " \tunsigned long flags;\n" - " \n" - " \tNCR5380_dprint(NDEBUG_ANY, instance);\n" - "@@ -743,13 +743,13 @@ static void NCR5380_print_status(struct\n" - " \tif (!hostdata->connected)\n" - " \t\tprintk(\"scsi%d: no currently connected command\\n\", HOSTNO);\n" - " \telse\n" - "-\t\tlprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected);\n" - "+\t\tlprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected);\n" - " \tprintk(\"scsi%d: issue_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - "+\tfor (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - " \t\tlprint_Scsi_Cmnd(ptr);\n" - " \n" - " \tprintk(\"scsi%d: disconnected_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr;\n" - " \t ptr = NEXT(ptr))\n" - " \t\tlprint_Scsi_Cmnd(ptr);\n" - " \n" - "@@ -757,7 +757,7 @@ static void NCR5380_print_status(struct\n" - " \tprintk(\"\\n\");\n" - " }\n" - " \n" - "-static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m)\n" - "+static void show_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m)\n" - " {\n" - " \tint i, s;\n" - " \tunsigned char *command;\n" - "@@ -775,7 +775,7 @@ static int __maybe_unused NCR5380_show_i\n" - " struct Scsi_Host *instance)\n" - " {\n" - " \tstruct NCR5380_hostdata *hostdata;\n" - "-\tScsi_Cmnd *ptr;\n" - "+\tstruct scsi_cmnd *ptr;\n" - " \tunsigned long flags;\n" - " \n" - " \thostdata = (struct NCR5380_hostdata *)instance->hostdata;\n" - "@@ -786,13 +786,13 @@ static int __maybe_unused NCR5380_show_i\n" - " \tif (!hostdata->connected)\n" - " \t\tseq_printf(m, \"scsi%d: no currently connected command\\n\", HOSTNO);\n" - " \telse\n" - "-\t\tshow_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m);\n" - "+\t\tshow_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m);\n" - " \tseq_printf(m, \"scsi%d: issue_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - "+\tfor (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - " \t\tshow_Scsi_Cmnd(ptr, m);\n" - " \n" - " \tseq_printf(m, \"scsi%d: disconnected_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr;\n" - " \t ptr = NEXT(ptr))\n" - " \t\tshow_Scsi_Cmnd(ptr, m);\n" - " \n" - "@@ -860,8 +860,8 @@ static void NCR5380_exit(struct Scsi_Hos\n" - " }\n" - " \n" - " /*\n" - "- * Function : int NCR5380_queue_command (Scsi_Cmnd *cmd,\n" - "- *\tvoid (*done)(Scsi_Cmnd *))\n" - "+ * Function : int NCR5380_queue_command (struct scsi_cmnd *cmd,\n" - "+ *\tvoid (*done)(struct scsi_cmnd *))\n" - " *\n" - " * Purpose : enqueues a SCSI command\n" - " *\n" - "@@ -877,10 +877,11 @@ static void NCR5380_exit(struct Scsi_Hos\n" - " *\n" - " */\n" - " \n" - "-static int NCR5380_queue_command_lck(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))\n" - "+static int NCR5380_queue_command_lck(struct scsi_cmnd *cmd,\n" - "+ void (*done)(struct scsi_cmnd *))\n" - " {\n" - " \tSETUP_HOSTDATA(cmd->device->host);\n" - "-\tScsi_Cmnd *tmp;\n" - "+\tstruct scsi_cmnd *tmp;\n" - " \tunsigned long flags;\n" - " \n" - " #if (NDEBUG & NDEBUG_NO_WRITE)\n" - "@@ -935,7 +936,7 @@ static int NCR5380_queue_command_lck(Scs\n" - " \t\tSET_NEXT(cmd, hostdata->issue_queue);\n" - " \t\thostdata->issue_queue = cmd;\n" - " \t} else {\n" - "-\t\tfor (tmp = (Scsi_Cmnd *)hostdata->issue_queue;\n" - "+\t\tfor (tmp = (struct scsi_cmnd *)hostdata->issue_queue;\n" - " \t\t NEXT(tmp); tmp = NEXT(tmp))\n" - " \t\t\t;\n" - " \t\tLIST(cmd, tmp);\n" - "@@ -976,7 +977,7 @@ static DEF_SCSI_QCMD(NCR5380_queue_comma\n" - " \n" - " static void NCR5380_main(struct work_struct *work)\n" - " {\n" - "-\tScsi_Cmnd *tmp, *prev;\n" - "+\tstruct scsi_cmnd *tmp, *prev;\n" - " \tstruct Scsi_Host *instance = first_instance;\n" - " \tstruct NCR5380_hostdata *hostdata = HOSTDATA(instance);\n" - " \tint done;\n" - "@@ -1019,7 +1020,7 @@ static void NCR5380_main(struct work_str\n" - " \t\t\t * for a target that's not busy.\n" - " \t\t\t */\n" - " #if (NDEBUG & NDEBUG_LISTS)\n" - "-\t\t\tfor (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL;\n" - "+\t\t\tfor (tmp = (struct scsi_cmnd *) hostdata->issue_queue, prev = NULL;\n" - " \t\t\t tmp && (tmp != prev); prev = tmp, tmp = NEXT(tmp))\n" - " \t\t\t\t;\n" - " \t\t\t/*printk(\"%p \", tmp);*/\n" - "@@ -1027,7 +1028,7 @@ static void NCR5380_main(struct work_str\n" - " \t\t\t\tprintk(\" LOOP\\n\");\n" - " \t\t\t/* else printk(\"\\n\"); */\n" - " #endif\n" - "-\t\t\tfor (tmp = (Scsi_Cmnd *) hostdata->issue_queue,\n" - "+\t\t\tfor (tmp = (struct scsi_cmnd *) hostdata->issue_queue,\n" - " \t\t\t prev = NULL; tmp; prev = tmp, tmp = NEXT(tmp)) {\n" - " \n" - " #if (NDEBUG & NDEBUG_LISTS)\n" - "@@ -1288,7 +1289,8 @@ static irqreturn_t NCR5380_intr(int irq,\n" - " }\n" - " \n" - " /*\n" - "- * Function : int NCR5380_select (struct Scsi_Host *instance, Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_select(struct Scsi_Host *instance,\n" - "+ * struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : establishes I_T_L or I_T_L_Q nexus for new or existing command,\n" - " *\tincluding ARBITRATION, SELECTION, and initial message out for\n" - "@@ -1315,7 +1317,7 @@ static irqreturn_t NCR5380_intr(int irq,\n" - " *\t\tcmd->result host byte set to DID_BAD_TARGET.\n" - " */\n" - " \n" - "-static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd)\n" - "+static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)\n" - " {\n" - " \tSETUP_HOSTDATA(instance);\n" - " \tunsigned char tmp[3], phase;\n" - "@@ -1914,7 +1916,7 @@ static void NCR5380_information_transfer\n" - " #endif\n" - " \tunsigned char *data;\n" - " \tunsigned char phase, tmp, extended_msg[10], old_phase = 0xff;\n" - "-\tScsi_Cmnd *cmd = (Scsi_Cmnd *) hostdata->connected;\n" - "+\tstruct scsi_cmnd *cmd = (struct scsi_cmnd *) hostdata->connected;\n" - " \n" - " \twhile (1) {\n" - " \t\ttmp = NCR5380_read(STATUS_REG);\n" - "@@ -2151,7 +2153,7 @@ static void NCR5380_information_transfer\n" - " \t\t\t\t\t\tlocal_irq_save(flags);\n" - " \t\t\t\t\t\tLIST(cmd,hostdata->issue_queue);\n" - " \t\t\t\t\t\tSET_NEXT(cmd, hostdata->issue_queue);\n" - "-\t\t\t\t\t\thostdata->issue_queue = (Scsi_Cmnd *) cmd;\n" - "+\t\t\t\t\t\thostdata->issue_queue = (struct scsi_cmnd *) cmd;\n" - " \t\t\t\t\t\tlocal_irq_restore(flags);\n" - " \t\t\t\t\t\tdprintk(NDEBUG_QUEUES, \"scsi%d: REQUEST SENSE added to head of \"\n" - " \t\t\t\t\t\t\t \"issue queue\\n\", H_NO(cmd));\n" - "@@ -2375,7 +2377,7 @@ static void NCR5380_information_transfer\n" - " * Function : void NCR5380_reselect (struct Scsi_Host *instance)\n" - " *\n" - " * Purpose : does reselection, initializing the instance->connected\n" - "- *\tfield to point to the Scsi_Cmnd for which the I_T_L or I_T_L_Q\n" - "+ *\tfield to point to the scsi_cmnd for which the I_T_L or I_T_L_Q\n" - " *\tnexus has been reestablished,\n" - " *\n" - " * Inputs : instance - this instance of the NCR5380.\n" - "@@ -2394,7 +2396,7 @@ static void NCR5380_reselect(struct Scsi\n" - " #endif\n" - " \tunsigned char msg[3];\n" - " \tunsigned char *data;\n" - "-\tScsi_Cmnd *tmp = NULL, *prev;\n" - "+\tstruct scsi_cmnd *tmp = NULL, *prev;\n" - " /*\tunsigned long flags; */\n" - " \n" - " \t/*\n" - "@@ -2468,7 +2470,7 @@ static void NCR5380_reselect(struct Scsi\n" - " \t * just reestablished, and remove it from the disconnected queue.\n" - " \t */\n" - " \n" - "-\tfor (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue, prev = NULL;\n" - "+\tfor (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue, prev = NULL;\n" - " \t tmp; prev = tmp, tmp = NEXT(tmp)) {\n" - " \t\tif ((target_mask == (1 << tmp->device->id)) && (lun == tmp->device->lun)\n" - " #ifdef SUPPORT_TAGS\n" - "@@ -2519,11 +2521,11 @@ static void NCR5380_reselect(struct Scsi\n" - " \n" - " \n" - " /*\n" - "- * Function : int NCR5380_abort (Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_abort (struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : abort a command\n" - " *\n" - "- * Inputs : cmd - the Scsi_Cmnd to abort, code - code to set the\n" - "+ * Inputs : cmd - the scsi_cmnd to abort, code - code to set the\n" - " *\thost byte of the result field to, if zero DID_ABORTED is\n" - " *\tused.\n" - " *\n" - "@@ -2536,11 +2538,11 @@ static void NCR5380_reselect(struct Scsi\n" - " */\n" - " \n" - " static\n" - "-int NCR5380_abort(Scsi_Cmnd *cmd)\n" - "+int NCR5380_abort(struct scsi_cmnd *cmd)\n" - " {\n" - " \tstruct Scsi_Host *instance = cmd->device->host;\n" - " \tSETUP_HOSTDATA(instance);\n" - "-\tScsi_Cmnd *tmp, **prev;\n" - "+\tstruct scsi_cmnd *tmp, **prev;\n" - " \tunsigned long flags;\n" - " \n" - " \tprintk(KERN_NOTICE \"scsi%d: aborting command\\n\", HOSTNO);\n" - "@@ -2610,8 +2612,8 @@ int NCR5380_abort(Scsi_Cmnd *cmd)\n" - " \t * Case 2 : If the command hasn't been issued yet, we simply remove it\n" - " \t *\t from the issue queue.\n" - " \t */\n" - "-\tfor (prev = (Scsi_Cmnd **)&(hostdata->issue_queue),\n" - "-\t tmp = (Scsi_Cmnd *)hostdata->issue_queue;\n" - "+\tfor (prev = (struct scsi_cmnd **)&(hostdata->issue_queue),\n" - "+\t tmp = (struct scsi_cmnd *)hostdata->issue_queue;\n" - " \t tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) {\n" - " \t\tif (cmd == tmp) {\n" - " \t\t\tREMOVE(5, *prev, tmp, NEXT(tmp));\n" - "@@ -2671,7 +2673,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd)\n" - " \t * it from the disconnected queue.\n" - " \t */\n" - " \n" - "-\tfor (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp;\n" - "+\tfor (tmp = (struct scsi_cmnd *) hostdata->disconnected_queue; tmp;\n" - " \t tmp = NEXT(tmp)) {\n" - " \t\tif (cmd == tmp) {\n" - " \t\t\tlocal_irq_restore(flags);\n" - "@@ -2685,8 +2687,8 @@ int NCR5380_abort(Scsi_Cmnd *cmd)\n" - " \t\t\tdo_abort(instance);\n" - " \n" - " \t\t\tlocal_irq_save(flags);\n" - "-\t\t\tfor (prev = (Scsi_Cmnd **)&(hostdata->disconnected_queue),\n" - "-\t\t\t tmp = (Scsi_Cmnd *)hostdata->disconnected_queue;\n" - "+\t\t\tfor (prev = (struct scsi_cmnd **)&(hostdata->disconnected_queue),\n" - "+\t\t\t tmp = (struct scsi_cmnd *)hostdata->disconnected_queue;\n" - " \t\t\t tmp; prev = NEXTADDR(tmp), tmp = NEXT(tmp)) {\n" - " \t\t\t\tif (cmd == tmp) {\n" - " \t\t\t\t\tREMOVE(5, *prev, tmp, NEXT(tmp));\n" - "@@ -2735,7 +2737,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd)\n" - " \n" - " \n" - " /*\n" - "- * Function : int NCR5380_reset (Scsi_Cmnd *cmd)\n" - "+ * Function : int NCR5380_reset (struct scsi_cmnd *cmd)\n" - " *\n" - " * Purpose : reset the SCSI bus.\n" - " *\n" - "@@ -2743,13 +2745,13 @@ int NCR5380_abort(Scsi_Cmnd *cmd)\n" - " *\n" - " */\n" - " \n" - "-static int NCR5380_bus_reset(Scsi_Cmnd *cmd)\n" - "+static int NCR5380_bus_reset(struct scsi_cmnd *cmd)\n" - " {\n" - " \tSETUP_HOSTDATA(cmd->device->host);\n" - " \tint i;\n" - " \tunsigned long flags;\n" - " #if defined(RESET_RUN_DONE)\n" - "-\tScsi_Cmnd *connected, *disconnected_queue;\n" - "+\tstruct scsi_cmnd *connected, *disconnected_queue;\n" - " #endif\n" - " \n" - " \tif (!IS_A_TT() && !falcon_got_lock)\n" - "@@ -2791,9 +2793,9 @@ static int NCR5380_bus_reset(Scsi_Cmnd *\n" - " \t * remembered in local variables first.\n" - " \t */\n" - " \tlocal_irq_save(flags);\n" - "-\tconnected = (Scsi_Cmnd *)hostdata->connected;\n" - "+\tconnected = (struct scsi_cmnd *)hostdata->connected;\n" - " \thostdata->connected = NULL;\n" - "-\tdisconnected_queue = (Scsi_Cmnd *)hostdata->disconnected_queue;\n" - "+\tdisconnected_queue = (struct scsi_cmnd *)hostdata->disconnected_queue;\n" - " \thostdata->disconnected_queue = NULL;\n" - " #ifdef SUPPORT_TAGS\n" - " \tfree_all_tags();\n" - "Index: linux/drivers/scsi/atari_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/atari_scsi.c\t2014-10-02 16:56:10.000000000 +1000\n" - "+++ linux/drivers/scsi/atari_scsi.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -93,7 +93,6 @@\n" - " #include <asm/irq.h>\n" - " #include <asm/traps.h>\n" - " \n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"atari_scsi.h\"\n" - " #include \"NCR5380.h\"\n" - "@@ -880,7 +879,7 @@ static long atari_scsi_dma_residual(stru\n" - " #define\tCMD_SURELY_BYTE_MODE\t1\n" - " #define\tCMD_MODE_UNKNOWN\t\t2\n" - " \n" - "-static int falcon_classify_cmd(Scsi_Cmnd *cmd)\n" - "+static int falcon_classify_cmd(struct scsi_cmnd *cmd)\n" - " {\n" - " \tunsigned char opcode = cmd->cmnd[0];\n" - " \n" - "@@ -912,7 +911,7 @@ static int falcon_classify_cmd(Scsi_Cmnd\n" - " */\n" - " \n" - " static unsigned long atari_dma_xfer_len(unsigned long wanted_len,\n" - "-\t\t\t\t\tScsi_Cmnd *cmd, int write_flag)\n" - "+\t\t\t\t\tstruct scsi_cmnd *cmd, int write_flag)\n" - " {\n" - " \tunsigned long\tpossible_len, limit;\n" - " \n" - "Index: linux/drivers/scsi/dmx3191d.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dmx3191d.c\t2014-10-02 16:56:05.000000000 +1000\n" - "+++ linux/drivers/scsi/dmx3191d.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -45,7 +45,6 @@\n" - " * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h)\n" - " */\n" - " #include <linux/delay.h>\n" - "-#include \"scsi.h\"\n" - " \n" - " #include \"NCR5380.h\"\n" - " #include \"NCR5380.c\"\n" - "Index: linux/drivers/scsi/dtc.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/dtc.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/dtc.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -58,7 +58,6 @@\n" - " #include <linux/init.h>\n" - " #include <linux/interrupt.h>\n" - " #include <linux/io.h>\n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"dtc.h\"\n" - " #define AUTOPROBE_IRQ\n" - "Index: linux/drivers/scsi/g_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/g_NCR5380.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/g_NCR5380.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -72,7 +72,6 @@\n" - " #include <asm/io.h>\n" - " #include <linux/signal.h>\n" - " #include <linux/blkdev.h>\n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"g_NCR5380.h\"\n" - " #include \"NCR5380.h\"\n" - "Index: linux/drivers/scsi/mac_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/mac_scsi.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/mac_scsi.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -30,7 +30,6 @@\n" - " #include <asm/macints.h>\n" - " #include <asm/mac_via.h>\n" - " \n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"mac_scsi.h\"\n" - " \n" - "Index: linux/drivers/scsi/pas16.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/pas16.c\t2014-10-02 16:56:09.000000000 +1000\n" - "+++ linux/drivers/scsi/pas16.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -81,7 +81,6 @@\n" - " #include <linux/stat.h>\n" - " #include <linux/init.h>\n" - " \n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"pas16.h\"\n" - " #define AUTOPROBE_IRQ\n" - "Index: linux/drivers/scsi/sun3_NCR5380.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/sun3_NCR5380.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/sun3_NCR5380.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -658,7 +658,7 @@ static void prepare_info(struct Scsi_Hos\n" - " * Inputs : instance, pointer to this instance. \n" - " */\n" - " \n" - "-static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd)\n" - "+static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd)\n" - " {\n" - " \tint i, s;\n" - " \tunsigned char *command;\n" - "@@ -675,7 +675,7 @@ static void lprint_Scsi_Cmnd(Scsi_Cmnd *\n" - " static void NCR5380_print_status(struct Scsi_Host *instance)\n" - " {\n" - " \tstruct NCR5380_hostdata *hostdata;\n" - "-\tScsi_Cmnd *ptr;\n" - "+\tstruct scsi_cmnd *ptr;\n" - " \tunsigned long flags;\n" - " \n" - " \tNCR5380_dprint(NDEBUG_ANY, instance);\n" - "@@ -689,13 +689,13 @@ static void NCR5380_print_status(struct\n" - " \tif (!hostdata->connected)\n" - " \t\tprintk(\"scsi%d: no currently connected command\\n\", HOSTNO);\n" - " \telse\n" - "-\t\tlprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected);\n" - "+\t\tlprint_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected);\n" - " \tprintk(\"scsi%d: issue_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - "+\tfor (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - " \t\tlprint_Scsi_Cmnd(ptr);\n" - " \n" - " \tprintk(\"scsi%d: disconnected_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr;\n" - " \t ptr = NEXT(ptr))\n" - " \t\tlprint_Scsi_Cmnd(ptr);\n" - " \n" - "@@ -703,7 +703,7 @@ static void NCR5380_print_status(struct\n" - " \tprintk(\"\\n\");\n" - " }\n" - " \n" - "-static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m)\n" - "+static void show_Scsi_Cmnd(struct scsi_cmnd *cmd, struct seq_file *m)\n" - " {\n" - " \tint i, s;\n" - " \tunsigned char *command;\n" - "@@ -721,7 +721,7 @@ static int __maybe_unused NCR5380_show_i\n" - " struct Scsi_Host *instance)\n" - " {\n" - " \tstruct NCR5380_hostdata *hostdata;\n" - "-\tScsi_Cmnd *ptr;\n" - "+\tstruct scsi_cmnd *ptr;\n" - " \tunsigned long flags;\n" - " \n" - " \thostdata = (struct NCR5380_hostdata *)instance->hostdata;\n" - "@@ -732,13 +732,13 @@ static int __maybe_unused NCR5380_show_i\n" - " \tif (!hostdata->connected)\n" - " \t\tseq_printf(m, \"scsi%d: no currently connected command\\n\", HOSTNO);\n" - " \telse\n" - "-\t\tshow_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m);\n" - "+\t\tshow_Scsi_Cmnd((struct scsi_cmnd *) hostdata->connected, m);\n" - " \tseq_printf(m, \"scsi%d: issue_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - "+\tfor (ptr = (struct scsi_cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))\n" - " \t\tshow_Scsi_Cmnd(ptr, m);\n" - " \n" - " \tseq_printf(m, \"scsi%d: disconnected_queue\\n\", HOSTNO);\n" - "-\tfor (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;\n" - "+\tfor (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr;\n" - " \t ptr = NEXT(ptr))\n" - " \t\tshow_Scsi_Cmnd(ptr, m);\n" - " \n" - "Index: linux/drivers/scsi/sun3_scsi.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/sun3_scsi.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/sun3_scsi.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -43,7 +43,6 @@\n" - " /* dma on! */\n" - " #define REAL_DMA\n" - " \n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"sun3_scsi.h\"\n" - " #include \"NCR5380.h\"\n" - "Index: linux/drivers/scsi/t128.c\n" - "===================================================================\n" - "--- linux.orig/drivers/scsi/t128.c\t2014-10-02 16:56:11.000000000 +1000\n" - "+++ linux/drivers/scsi/t128.c\t2014-10-02 16:56:14.000000000 +1000\n" - "@@ -77,7 +77,6 @@\n" - " #include <linux/module.h>\n" - " #include <linux/delay.h>\n" - " \n" - "-#include \"scsi.h\"\n" - " #include <scsi/scsi_host.h>\n" - " #include \"t128.h\"\n" - #define AUTOPROBE_IRQ + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: ncr5380-drop-legacy-scsi-h-include\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141002/af42c230/attachment.ksh> -a9bd1d200f4ef28d80f5af4c697119ca3a08f683ae188fad6133fd8b230cb1e1 +615285d8f15beb66da3b71521491546422be852a49ce9a60d394abb6dd0b0e23
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.