Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] wd33c93: Scsi_Cmnd convertion

Changes obsolete typedef'd Scsi_Cmnd to struct scsi_cmnd.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

authored by

Henrik Kretzschmar and committed by
James Bottomley
65396410 a506b44b

+18 -34
+3 -3
drivers/scsi/a2091.c
··· 40 40 return IRQ_HANDLED; 41 41 } 42 42 43 - static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 43 + static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 44 44 { 45 45 unsigned short cntr = CNTR_PDMD | CNTR_INTEN; 46 46 unsigned long addr = virt_to_bus(cmd->SCp.ptr); ··· 115 115 return 0; 116 116 } 117 117 118 - static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 118 + static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 119 119 int status) 120 120 { 121 121 /* disable SCSI interrupts */ ··· 217 217 return num_a2091; 218 218 } 219 219 220 - static int a2091_bus_reset(Scsi_Cmnd *cmd) 220 + static int a2091_bus_reset(struct scsi_cmnd *cmd) 221 221 { 222 222 /* FIXME perform bus-specific reset */ 223 223
-4
drivers/scsi/a2091.h
··· 13 13 14 14 int a2091_detect(struct scsi_host_template *); 15 15 int a2091_release(struct Scsi_Host *); 16 - const char *wd33c93_info(void); 17 - int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 18 - int wd33c93_abort(Scsi_Cmnd *); 19 - int wd33c93_reset(Scsi_Cmnd *, unsigned int); 20 16 21 17 #ifndef CMD_PER_LUN 22 18 #define CMD_PER_LUN 2
+4 -4
drivers/scsi/a3000.c
··· 44 44 return IRQ_NONE; 45 45 } 46 46 47 - static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 47 + static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 48 48 { 49 49 unsigned short cntr = CNTR_PDMD | CNTR_INTEN; 50 50 unsigned long addr = virt_to_bus(cmd->SCp.ptr); ··· 110 110 return 0; 111 111 } 112 112 113 - static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 114 - int status) 113 + static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 114 + int status) 115 115 { 116 116 /* disable SCSI interrupts */ 117 117 unsigned short cntr = CNTR_PDMD; ··· 205 205 return 0; 206 206 } 207 207 208 - static int a3000_bus_reset(Scsi_Cmnd *cmd) 208 + static int a3000_bus_reset(struct scsi_cmnd *cmd) 209 209 { 210 210 /* FIXME perform bus-specific reset */ 211 211
-4
drivers/scsi/a3000.h
··· 13 13 14 14 int a3000_detect(struct scsi_host_template *); 15 15 int a3000_release(struct Scsi_Host *); 16 - const char *wd33c93_info(void); 17 - int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 18 - int wd33c93_abort(Scsi_Cmnd *); 19 - int wd33c93_reset(Scsi_Cmnd *, unsigned int); 20 16 21 17 #ifndef CMD_PER_LUN 22 18 #define CMD_PER_LUN 2
+4 -4
drivers/scsi/gvp11.c
··· 47 47 gvp11_xfer_mask = ints[1]; 48 48 } 49 49 50 - static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 50 + static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 51 51 { 52 52 unsigned short cntr = GVP11_DMAC_INT_ENABLE; 53 53 unsigned long addr = virt_to_bus(cmd->SCp.ptr); ··· 142 142 return 0; 143 143 } 144 144 145 - static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 146 - int status) 145 + static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 146 + int status) 147 147 { 148 148 /* stop DMA */ 149 149 DMA(instance)->SP_DMA = 1; ··· 341 341 return num_gvp11; 342 342 } 343 343 344 - static int gvp11_bus_reset(Scsi_Cmnd *cmd) 344 + static int gvp11_bus_reset(struct scsi_cmnd *cmd) 345 345 { 346 346 /* FIXME perform bus-specific reset */ 347 347
-4
drivers/scsi/gvp11.h
··· 13 13 14 14 int gvp11_detect(struct scsi_host_template *); 15 15 int gvp11_release(struct Scsi_Host *); 16 - const char *wd33c93_info(void); 17 - int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 18 - int wd33c93_abort(Scsi_Cmnd *); 19 - int wd33c93_reset(Scsi_Cmnd *, unsigned int); 20 16 21 17 #ifndef CMD_PER_LUN 22 18 #define CMD_PER_LUN 2
+3 -3
drivers/scsi/mvme147.c
··· 29 29 return IRQ_HANDLED; 30 30 } 31 31 32 - static int dma_setup (Scsi_Cmnd *cmd, int dir_in) 32 + static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 33 33 { 34 34 unsigned char flags = 0x01; 35 35 unsigned long addr = virt_to_bus(cmd->SCp.ptr); ··· 57 57 return 0; 58 58 } 59 59 60 - static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 60 + static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 61 61 int status) 62 62 { 63 63 m147_pcc->dma_cntrl = 0; ··· 112 112 return 0; 113 113 } 114 114 115 - static int mvme147_bus_reset(Scsi_Cmnd *cmd) 115 + static int mvme147_bus_reset(struct scsi_cmnd *cmd) 116 116 { 117 117 /* FIXME perform bus-specific reset */ 118 118
-4
drivers/scsi/mvme147.h
··· 12 12 13 13 int mvme147_detect(struct scsi_host_template *); 14 14 int mvme147_release(struct Scsi_Host *); 15 - const char *wd33c93_info(void); 16 - int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 17 - int wd33c93_abort(Scsi_Cmnd *); 18 - int wd33c93_reset(Scsi_Cmnd *, unsigned int); 19 15 20 16 #ifndef CMD_PER_LUN 21 17 #define CMD_PER_LUN 2
+4 -4
drivers/scsi/sgiwd93.c
··· 97 97 } 98 98 99 99 static inline 100 - void fill_hpc_entries(struct hpc_chunk *hcp, Scsi_Cmnd *cmd, int datainp) 100 + void fill_hpc_entries(struct hpc_chunk *hcp, struct scsi_cmnd *cmd, int datainp) 101 101 { 102 102 unsigned long len = cmd->SCp.this_residual; 103 103 void *addr = cmd->SCp.ptr; ··· 129 129 hcp->desc.cntinfo = HPCDMA_EOX; 130 130 } 131 131 132 - static int dma_setup(Scsi_Cmnd *cmd, int datainp) 132 + static int dma_setup(struct scsi_cmnd *cmd, int datainp) 133 133 { 134 134 struct ip22_hostdata *hdata = HDATA(cmd->device->host); 135 135 struct hpc3_scsiregs *hregs = ··· 163 163 return 0; 164 164 } 165 165 166 - static void dma_stop(struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, 166 + static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 167 167 int status) 168 168 { 169 169 struct ip22_hostdata *hdata = HDATA(instance); ··· 305 305 return 1; 306 306 } 307 307 308 - static int sgiwd93_bus_reset(Scsi_Cmnd *cmd) 308 + static int sgiwd93_bus_reset(struct scsi_cmnd *cmd) 309 309 { 310 310 /* FIXME perform bus-specific reset */ 311 311