remove Scsi_Device typedef
Subsystems (8)
PATCH 3/3 remove Scsi_Device typedef
Signed-off-by Christoph Hellwig <[email protected]>
Documentation/scsi/scsi_mid_low_api.txt +1 -1
@@ -759,7 +759,7 @@ * * Defined in: drivers/scsi/scsi.c . **/ -int scsi_track_queue_full(Scsi_Device *sdev, int depth) +int scsi_track_queue_full(struct scsi_device *sdev, int depth) /**
drivers/block/acsi.c +0 -1
@@ -58,7 +58,6 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */ -typedef void Scsi_Device ;/* hack to avoid including scsi.h */ #include <scsi/scsi_ioctl.h> #include <linux/hdreg.h> /* for HDIO_GETGEO */ #include <linux/blkpg.h>
drivers/scsi/NCR53C9x.c +4 -4
@@ -1006,7 +1006,7 @@struct ESP_regs *eregs = esp->eregs;struct esp_device *esp_dev;Scsi_Cmnd *SCptr; -Scsi_Device *SDptr; +struct scsi_device *SDptr;volatile unchar *cmdp = esp->esp_command;unsigned char the_esp_command;int lun, target;
@@ -1687,7 +1687,7 @@static inline void esp_connect (struct NCR_ESP *esp,struct ESP_regs *eregs,Scsi_Cmnd *sp) { -Scsi_Device *dp = sp->device; +struct scsi_device *dp = sp->device;struct esp_device *esp_dev = dp->hostdata; if(esp->prev_soff != esp_dev->sync_max_offset ||
@@ -3605,7 +3605,7 @@ }#endif -int esp_slave_alloc (Scsi_Device *SDptr) +int esp_slave_alloc (struct scsi_device *SDptr) {struct esp_device *esp_dev =kmalloc (sizeof (struct esp_device ),GFP_ATOMIC );
@@ -3617,7 +3617,7 @@return 0 ; } -void esp_slave_destroy (Scsi_Device *SDptr) +void esp_slave_destroy (struct scsi_device *SDptr) {struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;
drivers/scsi/NCR53C9x.h +2 -2
@@ -664,6 +664,6 @@extern int esp_reset (Scsi_Cmnd *);extern int esp_proc_info (struct Scsi_Host *shost,char *buffer,char **start,off_t offset,int length,int inout); -extern int esp_slave_alloc (Scsi_Device *); -extern void esp_slave_destroy (Scsi_Device *); +extern int esp_slave_alloc (struct scsi_device *); +extern void esp_slave_destroy (struct scsi_device *);#endif /* !(NCR53C9X_H) */
drivers/scsi/aic7xxx_old.c +5 -5
@@ -6514,7 +6514,7 @@static void aic7xxx_init_transinfo (struct aic7xxx_host *p,struct aic_dev_data *aic_dev) { -Scsi_Device *sdpnt = aic_dev->SDptr; +struct scsi_device *sdpnt = aic_dev->SDptr;unsigned char tindex; tindex = sdpnt->id | (sdpnt->channel <<3 );
@@ -6581,7 +6581,7 @@* Set up the initial aic_dev struct pointers *-F*************************************************************************/ static int -aic7xxx_slave_alloc (Scsi_Device *SDptr) +aic7xxx_slave_alloc (struct scsi_device *SDptr) {struct aic7xxx_host *p = (struct aic7xxx_host *)SDptr->host->hostdata;struct aic_dev_data *aic_dev;
@@ -6644,7 +6644,7 @@* queueing to be [en|dis]abled for a specific adapter. *-F*************************************************************************/ static void -aic7xxx_device_queue_depth (struct aic7xxx_host *p,Scsi_Device *device) +aic7xxx_device_queue_depth (struct aic7xxx_host *p,struct scsi_device *device) {int tag_enabled = FALSE;struct aic_dev_data *aic_dev = device->hostdata;
@@ -6734,7 +6734,7 @@* prepare for this device to go away *-F*************************************************************************/ static void -aic7xxx_slave_destroy (Scsi_Device *SDptr) +aic7xxx_slave_destroy (struct scsi_device *SDptr) {struct aic_dev_data *aic_dev = SDptr->hostdata;
@@ -6754,7 +6754,7 @@* depths, allocate command structs, etc. *-F*************************************************************************/ static int -aic7xxx_slave_configure (Scsi_Device *SDptr) +aic7xxx_slave_configure (struct scsi_device *SDptr) {struct aic7xxx_host *p = (struct aic7xxx_host *) SDptr->host->hostdata;struct aic_dev_data *aic_dev;
drivers/scsi/arm/acornscsi.c +1 -1
@@ -2862,7 +2862,7 @@ int length, int inout) {int pos, begin =0 , devidx; -Scsi_Device *scd; +struct scsi_device *scd;AS_Host *host;char *p = buffer;
drivers/scsi/arm/fas216.c +2 -2
@@ -2559,7 +2559,7 @@ {FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;unsigned long flags; -Scsi_Device *SDpnt; +struct scsi_device *SDpnt;fas216_checkmagic (info);fas216_log (info,LOG_ERROR ,"resetting bus" );
@@ -3000,7 +3000,7 @@int fas216_print_devices (FAS216_Info *info,char *buffer) {struct fas216_device *dev; -Scsi_Device *scd; +struct scsi_device *scd;char *p = buffer; p +=sprintf (p,"Device/Lun TaggedQ Parity Sync\n" );
drivers/scsi/cpqfcTS.h +1 -1
@@ -14,6 +14,6 @@extern int cpqfcTS_eh_device_reset (Scsi_Cmnd *);extern int cpqfcTS_biosparam (struct scsi_device *,struct block_device *,sector_t ,int []); -extern int cpqfcTS_ioctl (Scsi_Device *ScsiDev,int Cmnd,void *arg); +extern int cpqfcTS_ioctl (struct scsi_device *ScsiDev,int Cmnd,void *arg);#endif /* CPQFCTS_H */
drivers/scsi/cpqfcTSinit.c +7 -7
@@ -64,7 +64,7 @@MODULE_DESCRIPTION ("Driver for Compaq 64-bit/66Mhz PCI Fibre Channel HBA v. 2.5.4" );MODULE_LICENSE ("GPL" ); -int cpqfcTS_TargetDeviceReset (Scsi_Device *ScsiDev,unsigned int reset_flags); +int cpqfcTS_TargetDeviceReset (struct scsi_device *ScsiDev,unsigned int reset_flags);// This struct was originally defined in // /usr/src/linux/include/linux/proc_fs.h
@@ -574,7 +574,7 @@int i, j;VENDOR_IOCTL_REQ ioc;cpqfc_passthru_t *vendor_cmd; -Scsi_Device *SDpnt; +struct scsi_device *SDpnt;Scsi_Request *ScsiPassThruReq;cpqfc_passthru_private_t *privatedata;
@@ -1393,7 +1393,7 @@// to be back in between 25 - 500ms. // If the FC port doesn't log back in within several seconds // (i.e. implicit "logout"), or we get an explicit logout, -// we set "device_blocked" in Scsi_Device struct; in this +// we set "device_blocked" in struct scsi_device struct; in this // case 30 seconds will elapse before Linux/Scsi sends another // command to the device. else if( pLoggedInPort->prli != TRUE )
@@ -1594,7 +1594,7 @@#ifdef SUPPORT_RESET -int cpqfcTS_TargetDeviceReset (Scsi_Device *ScsiDev, +int cpqfcTS_TargetDeviceReset (struct scsi_device *ScsiDev,unsigned int reset_flags) {int timeout =10 *HZ ;
@@ -1602,7 +1602,7 @@char scsi_cdb[12 ];int result;Scsi_Cmnd * SCpnt; -Scsi_Device * SDpnt; +struct scsi_device * SDpnt;// FIXME, cpqfcTS_TargetDeviceReset needs to be fixed // similarly to how the passthrough ioctl was fixed
@@ -1674,7 +1674,7 @@ }#else -int cpqfcTS_TargetDeviceReset (Scsi_Device *ScsiDev, +int cpqfcTS_TargetDeviceReset (struct scsi_device *ScsiDev,unsigned int reset_flags) {return -ENOTSUPP ;
@@ -1685,7 +1685,7 @@int cpqfcTS_eh_device_reset (Scsi_Cmnd *Cmnd) {int retval; -Scsi_Device *SDpnt = Cmnd->device; +struct scsi_device *SDpnt = Cmnd->device;// printk(" ENTERING cpqfcTS_eh_device_reset() \n"); spin_unlock_irq (Cmnd->device->host->host_lock); retval =cpqfcTS_TargetDeviceReset ( SDpnt,0 );
drivers/scsi/cpqfcTSstructs.h +1 -1
@@ -727,7 +727,7 @@// when the "target" (actually FC Port) is waiting for login // (e.g. after Link reset), set the device_blocked bit; // after Port completes login, un-block target. -UCHAR device_blocked;// see Scsi_Device struct +UCHAR device_blocked;// see struct scsi_device struct // define singly-linked list of logged-in ports // once a port_id is identified, it is remembered,
drivers/scsi/fcal.c +2 -2
@@ -70,7 +70,7 @@static int fcal_encode_addr (Scsi_Cmnd *SCpnt,u16 *addr,fc_channel *fc,fcp_cmnd *fcmd); -int fcal_slave_configure (Scsi_Device *device) +int fcal_slave_configure (struct scsi_device *device) {int depth_to_use;
@@ -244,7 +244,7 @@SPRINTF (" [AL-PA: %02x, Port WWN: %08x%08x, Node WWN: %08x%08x] Not responded to PRLI\n" , alpa, u1[0 ], u1[1 ], u2[0 ], u2[1 ]); }else { -Scsi_Device *scd; +struct scsi_device *scd;shost_for_each_device (scd, host)if (scd->id == target) { SPRINTF (" [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x] ",
drivers/scsi/fcal.h +1 -1
@@ -22,6 +22,6 @@int fcal_detect (struct scsi_host_template *);int fcal_release (struct Scsi_Host *); -int fcal_slave_configure (Scsi_Device *); +int fcal_slave_configure (struct scsi_device *);#endif /* !(_FCAL_H) */
drivers/scsi/g_NCR5380.c +1 -1
@@ -798,7 +798,7 @@Scsi_Cmnd *ptr;struct NCR5380_hostdata *hostdata;#ifdef NCR5380_STATS -Scsi_Device *dev; +struct scsi_device *dev;extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE ];#endif
drivers/scsi/gdth.c +3 -3
@@ -5562,7 +5562,7 @@#else Scsi_Cmnd *scp;#endif -Scsi_Device *sdev; +struct scsi_device *sdev;char cmnd[MAX_COMMAND_SIZE ];memset (cmnd,0xff ,MAX_COMMAND_SIZE );
@@ -5624,10 +5624,10 @@gdth_cmd_str gdtcmd;#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )Scsi_Request *srp; -Scsi_Device *sdev; +struct scsi_device *sdev;#else Scsi_Cmnd *scp; -Scsi_Device *sdev; +struct scsi_device *sdev;#endif char cmnd[MAX_COMMAND_SIZE ];#endif
drivers/scsi/gdth.h +2 -2
@@ -944,9 +944,9 @@ulong dma32_cnt, dma64_cnt;/* statistics: DMA buffer */ #endif #if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,4 ,0 ) -Scsi_Device *sdev; +struct scsi_device *sdev;#else -Scsi_Device sdev; +struct scsi_device sdev;#endif } gdth_ha_str;
drivers/scsi/gdth_proc.c +5 -5
@@ -54,10 +54,10 @@int ret_val = -EINVAL ;#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )Scsi_Request *scp; -Scsi_Device *sdev; +struct scsi_device *sdev;#else Scsi_Cmnd *scp; -Scsi_Device *sdev; +struct scsi_device *sdev;#endif TRACE2 (("gdth_set_info() ha %d bus %d\n" ,hanum,busnum));
@@ -232,10 +232,10 @@gdth_evt_str *estr;#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )Scsi_Request *scp; -Scsi_Device *sdev; +struct scsi_device *sdev;#else Scsi_Cmnd *scp; -Scsi_Device *sdev; +struct scsi_device *sdev;#endif char hrec[161 ];struct timeval tv;
@@ -275,7 +275,7 @@ scp->cmd_len =12 ; scp->use_sg =0 ;#else -memset (&sdev,0 ,sizeof (Scsi_Device)); +memset (&sdev,0 ,sizeof (struct scsi_device ));memset (&scp,0 ,sizeof (Scsi_Cmnd)); sdev.host = scp.host = host; sdev.id = scp.target = sdev.host->this_id;
drivers/scsi/ide-scsi.c +1 -1
@@ -875,7 +875,7 @@struct gendisk *disk = cmd->request->rq_disk;if (disk) { -struct Scsi_Device_Template **p = disk->private_data; + struct struct scsi_device_Template **p = disk->private_data;if (strcmp ((*p)->scsi_driverfs_driver.name,"sg" ) ==0 )return test_bit (IDESCSI_SG_TRANSFORM , &scsi->transform); }
drivers/scsi/ips.c +3 -3
@@ -1263,9 +1263,9 @@/* */ /****************************************************************************/ static void -ips_select_queue_depth (struct Scsi_Host *host,Scsi_Device * scsi_devs) +ips_select_queue_depth (struct Scsi_Host *host,struct scsi_device * scsi_devs) { -Scsi_Device *device; +struct scsi_device *device;ips_ha_t *ha;int count =0 ;int min;
@@ -1308,7 +1308,7 @@/* */ /****************************************************************************/ static int -ips_slave_configure (Scsi_Device * SDptr) +ips_slave_configure (struct scsi_device * SDptr) {ips_ha_t *ha;int min;
drivers/scsi/ips.h +2 -2
@@ -446,13 +446,13 @@*/ #if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,5 ,0 )static int ips_proc24_info (char *,char **,off_t ,int ,int ,int ); -static void ips_select_queue_depth (struct Scsi_Host *,Scsi_Device *); +static void ips_select_queue_depth (struct Scsi_Host *,struct scsi_device *);static int ips_biosparam (Disk *disk,kdev_t dev,int geom[]);#else static int ips_proc_info (struct Scsi_Host *,char *,char **,off_t ,int ,int );static int ips_biosparam (struct scsi_device *sdev,struct block_device *bdev,sector_t capacity,int geom[]); -static int ips_slave_configure (Scsi_Device *SDptr); +static int ips_slave_configure (struct scsi_device *SDptr);#endif /*
drivers/scsi/pcmcia/nsp_cs.c +1 -1
@@ -1717,7 +1717,7 @@struct Scsi_Host *host;nsp_hw_data *data = &nsp_data_base;#if !(LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,5 ,74 )) -Scsi_Device *dev; +struct scsi_device *dev;dev_node_t **tail, *node;#endif
drivers/scsi/pluto.c +2 -2
@@ -71,7 +71,7 @@up (&fc_sem); } -int pluto_slave_configure (Scsi_Device *device) +int pluto_slave_configure (struct scsi_device *device) {int depth_to_use;
@@ -94,7 +94,7 @@ {int i, retry, nplutos;fc_channel *fc; -Scsi_Device dev; +struct scsi_device dev;struct timer_list fc_timer =TIMER_INITIALIZER (pluto_detect_timeout,0 ,0 );
drivers/scsi/pluto.h +1 -1
@@ -41,7 +41,7 @@int pluto_detect (struct scsi_host_template *);int pluto_release (struct Scsi_Host *);const char *pluto_info (struct Scsi_Host *); -int pluto_slave_configure (Scsi_Device *); +int pluto_slave_configure (struct scsi_device *);#endif /* !(_PLUTO_H) */
drivers/scsi/scsi_scan.c +24 -24
136 lines not on this page · raw message
drivers/scsi/scsi_typedefs.h +0 -1
@@ -1,4 +1,3 @@ -typedef struct scsi_device Scsi_Device ;typedef struct scsi_cmnd Scsi_Cmnd ;typedef struct scsi_request Scsi_Request ;