[SCSI] remove Scsi_Device typedef

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Christoph Hellwig 2005-10-31 18:32:08 +01:00 committed by James Bottomley
parent 0a04137e75
commit f64a181d89
22 changed files with 64 additions and 66 deletions

View File

@ -718,7 +718,7 @@ void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)
* *
* Defined in: drivers/scsi/scsi.c . * 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)
/** /**

View File

@ -58,7 +58,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */ #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 <scsi/scsi_ioctl.h>
#include <linux/hdreg.h> /* for HDIO_GETGEO */ #include <linux/hdreg.h> /* for HDIO_GETGEO */
#include <linux/blkpg.h> #include <linux/blkpg.h>

View File

@ -1006,7 +1006,7 @@ static void esp_exec_cmd(struct NCR_ESP *esp)
struct ESP_regs *eregs = esp->eregs; struct ESP_regs *eregs = esp->eregs;
struct esp_device *esp_dev; struct esp_device *esp_dev;
Scsi_Cmnd *SCptr; Scsi_Cmnd *SCptr;
Scsi_Device *SDptr; struct scsi_device *SDptr;
volatile unchar *cmdp = esp->esp_command; volatile unchar *cmdp = esp->esp_command;
unsigned char the_esp_command; unsigned char the_esp_command;
int lun, target; int lun, target;
@ -1687,7 +1687,7 @@ static inline int reconnect_lun(struct NCR_ESP *esp, struct ESP_regs *eregs)
static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs, static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
Scsi_Cmnd *sp) Scsi_Cmnd *sp)
{ {
Scsi_Device *dp = sp->device; struct scsi_device *dp = sp->device;
struct esp_device *esp_dev = dp->hostdata; struct esp_device *esp_dev = dp->hostdata;
if(esp->prev_soff != esp_dev->sync_max_offset || if(esp->prev_soff != esp_dev->sync_max_offset ||
@ -3605,7 +3605,7 @@ out:
} }
#endif #endif
int esp_slave_alloc(Scsi_Device *SDptr) int esp_slave_alloc(struct scsi_device *SDptr)
{ {
struct esp_device *esp_dev = struct esp_device *esp_dev =
kmalloc(sizeof(struct esp_device), GFP_ATOMIC); kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
@ -3617,7 +3617,7 @@ int esp_slave_alloc(Scsi_Device *SDptr)
return 0; 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; struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;

View File

@ -664,6 +664,6 @@ extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *); extern int esp_reset(Scsi_Cmnd *);
extern int esp_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset, int length, extern int esp_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset, int length,
int inout); int inout);
extern int esp_slave_alloc(Scsi_Device *); extern int esp_slave_alloc(struct scsi_device *);
extern void esp_slave_destroy(Scsi_Device *); extern void esp_slave_destroy(struct scsi_device *);
#endif /* !(NCR53C9X_H) */ #endif /* !(NCR53C9X_H) */

View File

@ -820,7 +820,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
break; break;
/* /*
* Find the Scsi_Device associated with the SCSI * Find the scsi_device associated with the SCSI
* address. Make sure we have the right array, and if * address. Make sure we have the right array, and if
* so set the flag to initiate a new re-config once we * so set the flag to initiate a new re-config once we
* see an AifEnConfigChange AIF come through. * see an AifEnConfigChange AIF come through.
@ -987,7 +987,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
/* /*
* Find the Scsi_Device associated with the SCSI address, * Find the scsi_device associated with the SCSI address,
* and mark it as changed, invalidating the cache. This deals * and mark it as changed, invalidating the cache. This deals
* with changes to existing device IDs. * with changes to existing device IDs.
*/ */

View File

@ -6514,7 +6514,7 @@ do_aic7xxx_isr(int irq, void *dev_id, struct pt_regs *regs)
static void static void
aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev) 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; unsigned char tindex;
tindex = sdpnt->id | (sdpnt->channel << 3); tindex = sdpnt->id | (sdpnt->channel << 3);
@ -6581,7 +6581,7 @@ aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev)
* Set up the initial aic_dev struct pointers * Set up the initial aic_dev struct pointers
*-F*************************************************************************/ *-F*************************************************************************/
static int 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 aic7xxx_host *p = (struct aic7xxx_host *)SDptr->host->hostdata;
struct aic_dev_data *aic_dev; struct aic_dev_data *aic_dev;
@ -6644,7 +6644,7 @@ aic7xxx_slave_alloc(Scsi_Device *SDptr)
* queueing to be [en|dis]abled for a specific adapter. * queueing to be [en|dis]abled for a specific adapter.
*-F*************************************************************************/ *-F*************************************************************************/
static void 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; int tag_enabled = FALSE;
struct aic_dev_data *aic_dev = device->hostdata; struct aic_dev_data *aic_dev = device->hostdata;
@ -6734,7 +6734,7 @@ aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
* prepare for this device to go away * prepare for this device to go away
*-F*************************************************************************/ *-F*************************************************************************/
static void static void
aic7xxx_slave_destroy(Scsi_Device *SDptr) aic7xxx_slave_destroy(struct scsi_device *SDptr)
{ {
struct aic_dev_data *aic_dev = SDptr->hostdata; struct aic_dev_data *aic_dev = SDptr->hostdata;
@ -6754,7 +6754,7 @@ aic7xxx_slave_destroy(Scsi_Device *SDptr)
* depths, allocate command structs, etc. * depths, allocate command structs, etc.
*-F*************************************************************************/ *-F*************************************************************************/
static int 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 aic7xxx_host *p = (struct aic7xxx_host *) SDptr->host->hostdata;
struct aic_dev_data *aic_dev; struct aic_dev_data *aic_dev;

View File

@ -2862,7 +2862,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
int length, int inout) int length, int inout)
{ {
int pos, begin = 0, devidx; int pos, begin = 0, devidx;
Scsi_Device *scd; struct scsi_device *scd;
AS_Host *host; AS_Host *host;
char *p = buffer; char *p = buffer;

View File

@ -2559,7 +2559,7 @@ int fas216_eh_bus_reset(Scsi_Cmnd *SCpnt)
{ {
FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata; FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
unsigned long flags; unsigned long flags;
Scsi_Device *SDpnt; struct scsi_device *SDpnt;
fas216_checkmagic(info); fas216_checkmagic(info);
fas216_log(info, LOG_ERROR, "resetting bus"); fas216_log(info, LOG_ERROR, "resetting bus");
@ -3000,7 +3000,7 @@ int fas216_print_stats(FAS216_Info *info, char *buffer)
int fas216_print_devices(FAS216_Info *info, char *buffer) int fas216_print_devices(FAS216_Info *info, char *buffer)
{ {
struct fas216_device *dev; struct fas216_device *dev;
Scsi_Device *scd; struct scsi_device *scd;
char *p = buffer; char *p = buffer;
p += sprintf(p, "Device/Lun TaggedQ Parity Sync\n"); p += sprintf(p, "Device/Lun TaggedQ Parity Sync\n");

View File

@ -70,7 +70,7 @@ static unsigned char target2alpa[] = {
static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmnd *fcmd); 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; int depth_to_use;
@ -244,7 +244,7 @@ int fcal_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t of
SPRINTF (" [AL-PA: %02x, Port WWN: %08x%08x, Node WWN: %08x%08x] Not responded to PRLI\n", 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]); alpa, u1[0], u1[1], u2[0], u2[1]);
} else { } else {
Scsi_Device *scd; struct scsi_device *scd;
shost_for_each_device(scd, host) shost_for_each_device(scd, host)
if (scd->id == target) { if (scd->id == target) {
SPRINTF (" [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x] ", SPRINTF (" [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x] ",

View File

@ -22,6 +22,6 @@ struct fcal {
int fcal_detect(struct scsi_host_template *); int fcal_detect(struct scsi_host_template *);
int fcal_release(struct Scsi_Host *); int fcal_release(struct Scsi_Host *);
int fcal_slave_configure(Scsi_Device *); int fcal_slave_configure(struct scsi_device *);
#endif /* !(_FCAL_H) */ #endif /* !(_FCAL_H) */

View File

@ -798,7 +798,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
Scsi_Cmnd *ptr; Scsi_Cmnd *ptr;
struct NCR5380_hostdata *hostdata; struct NCR5380_hostdata *hostdata;
#ifdef NCR5380_STATS #ifdef NCR5380_STATS
Scsi_Device *dev; struct scsi_device *dev;
extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
#endif #endif

View File

@ -5562,7 +5562,7 @@ static void gdth_flush(int hanum)
#else #else
Scsi_Cmnd *scp; Scsi_Cmnd *scp;
#endif #endif
Scsi_Device *sdev; struct scsi_device *sdev;
char cmnd[MAX_COMMAND_SIZE]; char cmnd[MAX_COMMAND_SIZE];
memset(cmnd, 0xff, MAX_COMMAND_SIZE); memset(cmnd, 0xff, MAX_COMMAND_SIZE);
@ -5624,10 +5624,10 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
gdth_cmd_str gdtcmd; gdth_cmd_str gdtcmd;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *srp; Scsi_Request *srp;
Scsi_Device *sdev; struct scsi_device *sdev;
#else #else
Scsi_Cmnd *scp; Scsi_Cmnd *scp;
Scsi_Device *sdev; struct scsi_device *sdev;
#endif #endif
char cmnd[MAX_COMMAND_SIZE]; char cmnd[MAX_COMMAND_SIZE];
#endif #endif

View File

@ -944,9 +944,9 @@ typedef struct {
ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */ ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
Scsi_Device *sdev; struct scsi_device *sdev;
#else #else
Scsi_Device sdev; struct scsi_device sdev;
#endif #endif
} gdth_ha_str; } gdth_ha_str;

View File

@ -54,10 +54,10 @@ static int gdth_set_info(char *buffer,int length,struct Scsi_Host *host,
int ret_val = -EINVAL; int ret_val = -EINVAL;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *scp; Scsi_Request *scp;
Scsi_Device *sdev; struct scsi_device *sdev;
#else #else
Scsi_Cmnd *scp; Scsi_Cmnd *scp;
Scsi_Device *sdev; struct scsi_device *sdev;
#endif #endif
TRACE2(("gdth_set_info() ha %d bus %d\n",hanum,busnum)); TRACE2(("gdth_set_info() ha %d bus %d\n",hanum,busnum));
@ -232,10 +232,10 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
gdth_evt_str *estr; gdth_evt_str *estr;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
Scsi_Request *scp; Scsi_Request *scp;
Scsi_Device *sdev; struct scsi_device *sdev;
#else #else
Scsi_Cmnd *scp; Scsi_Cmnd *scp;
Scsi_Device *sdev; struct scsi_device *sdev;
#endif #endif
char hrec[161]; char hrec[161];
struct timeval tv; struct timeval tv;
@ -275,7 +275,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
scp->cmd_len = 12; scp->cmd_len = 12;
scp->use_sg = 0; scp->use_sg = 0;
#else #else
memset(&sdev,0,sizeof(Scsi_Device)); memset(&sdev,0,sizeof(struct scsi_device));
memset(&scp, 0,sizeof(Scsi_Cmnd)); memset(&scp, 0,sizeof(Scsi_Cmnd));
sdev.host = scp.host = host; sdev.host = scp.host = host;
sdev.id = scp.target = sdev.host->this_id; sdev.id = scp.target = sdev.host->this_id;

View File

@ -882,7 +882,7 @@ static inline int should_transform(ide_drive_t *drive, struct scsi_cmnd *cmd)
struct gendisk *disk = cmd->request->rq_disk; struct gendisk *disk = cmd->request->rq_disk;
if (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) if (strcmp((*p)->scsi_driverfs_driver.name, "sg") == 0)
return test_bit(IDESCSI_SG_TRANSFORM, &scsi->transform); return test_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
} }

View File

@ -1262,9 +1262,9 @@ ips_proc24_info(char *buffer, char **start, off_t offset, int length,
/* */ /* */
/****************************************************************************/ /****************************************************************************/
static void 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; ips_ha_t *ha;
int count = 0; int count = 0;
int min; int min;
@ -1307,7 +1307,7 @@ ips_select_queue_depth(struct Scsi_Host *host, Scsi_Device * scsi_devs)
/* */ /* */
/****************************************************************************/ /****************************************************************************/
static int static int
ips_slave_configure(Scsi_Device * SDptr) ips_slave_configure(struct scsi_device * SDptr)
{ {
ips_ha_t *ha; ips_ha_t *ha;
int min; int min;

View File

@ -449,13 +449,13 @@
*/ */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
static int ips_proc24_info(char *, char **, off_t, int, int, int); 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[]); static int ips_biosparam(Disk *disk, kdev_t dev, int geom[]);
#else #else
static int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int); 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, static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int geom[]); sector_t capacity, int geom[]);
static int ips_slave_configure(Scsi_Device *SDptr); static int ips_slave_configure(struct scsi_device *SDptr);
#endif #endif
/* /*

View File

@ -1717,7 +1717,7 @@ static void nsp_cs_config(dev_link_t *link)
struct Scsi_Host *host; struct Scsi_Host *host;
nsp_hw_data *data = &nsp_data_base; nsp_hw_data *data = &nsp_data_base;
#if !(LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74)) #if !(LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
Scsi_Device *dev; struct scsi_device *dev;
dev_node_t **tail, *node; dev_node_t **tail, *node;
#endif #endif

View File

@ -71,7 +71,7 @@ static void __init pluto_detect_scsi_done(Scsi_Cmnd *SCpnt)
up(&fc_sem); up(&fc_sem);
} }
int pluto_slave_configure(Scsi_Device *device) int pluto_slave_configure(struct scsi_device *device)
{ {
int depth_to_use; int depth_to_use;
@ -94,7 +94,7 @@ int __init pluto_detect(struct scsi_host_template *tpnt)
{ {
int i, retry, nplutos; int i, retry, nplutos;
fc_channel *fc; fc_channel *fc;
Scsi_Device dev; struct scsi_device dev;
DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0); DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0);
tpnt->proc_name = "pluto"; tpnt->proc_name = "pluto";

View File

@ -41,7 +41,7 @@ struct pluto_inquiry {
int pluto_detect(struct scsi_host_template *); int pluto_detect(struct scsi_host_template *);
int pluto_release(struct Scsi_Host *); int pluto_release(struct Scsi_Host *);
const char * pluto_info(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) */ #endif /* !(_PLUTO_H) */

View File

@ -9,7 +9,7 @@
* global variable (boot or module load time) settings. * global variable (boot or module load time) settings.
* *
* A specific LUN is scanned via an INQUIRY command; if the LUN has a * A specific LUN is scanned via an INQUIRY command; if the LUN has a
* device attached, a Scsi_Device is allocated and setup for it. * device attached, a scsi_device is allocated and setup for it.
* *
* For every id of every channel on the given host: * For every id of every channel on the given host:
* *
@ -17,7 +17,7 @@
* device or storage attached to LUN 0): * device or storage attached to LUN 0):
* *
* If LUN 0 has a device attached, allocate and setup a * If LUN 0 has a device attached, allocate and setup a
* Scsi_Device for it. * scsi_device for it.
* *
* If target is SCSI-3 or up, issue a REPORT LUN, and scan * If target is SCSI-3 or up, issue a REPORT LUN, and scan
* all of the LUNs returned by the REPORT LUN; else, * all of the LUNs returned by the REPORT LUN; else,
@ -441,7 +441,7 @@ void scsi_target_reap(struct scsi_target *starget)
* *
* If the INQUIRY is successful, zero is returned and the * If the INQUIRY is successful, zero is returned and the
* INQUIRY data is in @inq_result; the scsi_level and INQUIRY length * INQUIRY data is in @inq_result; the scsi_level and INQUIRY length
* are copied to the Scsi_Device any flags value is stored in *@bflags. * are copied to the scsi_device any flags value is stored in *@bflags.
**/ **/
static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result, static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
int result_len, int *bflags) int result_len, int *bflags)
@ -509,8 +509,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
/* /*
* Get any flags for this device. * Get any flags for this device.
* *
* XXX add a bflags to Scsi_Device, and replace the * XXX add a bflags to scsi_device, and replace the
* corresponding bit fields in Scsi_Device, so bflags * corresponding bit fields in scsi_device, so bflags
* need not be passed as an argument. * need not be passed as an argument.
*/ */
*bflags = scsi_get_device_flags(sdev, &inq_result[8], *bflags = scsi_get_device_flags(sdev, &inq_result[8],
@ -592,21 +592,21 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
} }
/** /**
* scsi_add_lun - allocate and fully initialze a Scsi_Device * scsi_add_lun - allocate and fully initialze a scsi_device
* @sdevscan: holds information to be stored in the new Scsi_Device * @sdevscan: holds information to be stored in the new scsi_device
* @sdevnew: store the address of the newly allocated Scsi_Device * @sdevnew: store the address of the newly allocated scsi_device
* @inq_result: holds the result of a previous INQUIRY to the LUN * @inq_result: holds the result of a previous INQUIRY to the LUN
* @bflags: black/white list flag * @bflags: black/white list flag
* *
* Description: * Description:
* Allocate and initialize a Scsi_Device matching sdevscan. Optionally * Allocate and initialize a scsi_device matching sdevscan. Optionally
* set fields based on values in *@bflags. If @sdevnew is not * set fields based on values in *@bflags. If @sdevnew is not
* NULL, store the address of the new Scsi_Device in *@sdevnew (needed * NULL, store the address of the new scsi_device in *@sdevnew (needed
* when scanning a particular LUN). * when scanning a particular LUN).
* *
* Return: * Return:
* SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device
* SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
**/ **/
static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
{ {
@ -674,7 +674,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
* *
* The above is vague, as it implies that we could treat 001 and * The above is vague, as it implies that we could treat 001 and
* 011 the same. Stay compatible with previous code, and create a * 011 the same. Stay compatible with previous code, and create a
* Scsi_Device for a PQ of 1 * scsi_device for a PQ of 1
* *
* Don't set the device offline here; rather let the upper * Don't set the device offline here; rather let the upper
* level drivers eval the PQ to decide whether they should * level drivers eval the PQ to decide whether they should
@ -784,8 +784,8 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
* scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it
* @starget: pointer to target device structure * @starget: pointer to target device structure
* @lun: LUN of target device * @lun: LUN of target device
* @sdevscan: probe the LUN corresponding to this Scsi_Device * @sdevscan: probe the LUN corresponding to this scsi_device
* @sdevnew: store the value of any new Scsi_Device allocated * @sdevnew: store the value of any new scsi_device allocated
* @bflagsp: store bflags here if not NULL * @bflagsp: store bflags here if not NULL
* *
* Description: * Description:
@ -793,10 +793,10 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
* allocate and set it up by calling scsi_add_lun. * allocate and set it up by calling scsi_add_lun.
* *
* Return: * Return:
* SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device
* SCSI_SCAN_TARGET_PRESENT: target responded, but no device is * SCSI_SCAN_TARGET_PRESENT: target responded, but no device is
* attached at the LUN * attached at the LUN
* SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
**/ **/
static int scsi_probe_and_add_lun(struct scsi_target *starget, static int scsi_probe_and_add_lun(struct scsi_target *starget,
uint lun, int *bflagsp, uint lun, int *bflagsp,
@ -1046,7 +1046,7 @@ EXPORT_SYMBOL(int_to_scsilun);
/** /**
* scsi_report_lun_scan - Scan using SCSI REPORT LUN results * scsi_report_lun_scan - Scan using SCSI REPORT LUN results
* @sdevscan: scan the host, channel, and id of this Scsi_Device * @sdevscan: scan the host, channel, and id of this scsi_device
* *
* Description: * Description:
* If @sdevscan is for a SCSI-3 or up device, send a REPORT LUN * If @sdevscan is for a SCSI-3 or up device, send a REPORT LUN
@ -1474,16 +1474,16 @@ void scsi_forget_host(struct Scsi_Host *shost)
/* /*
* Function: scsi_get_host_dev() * Function: scsi_get_host_dev()
* *
* Purpose: Create a Scsi_Device that points to the host adapter itself. * Purpose: Create a scsi_device that points to the host adapter itself.
* *
* Arguments: SHpnt - Host that needs a Scsi_Device * Arguments: SHpnt - Host that needs a scsi_device
* *
* Lock status: None assumed. * Lock status: None assumed.
* *
* Returns: The Scsi_Device or NULL * Returns: The scsi_device or NULL
* *
* Notes: * Notes:
* Attach a single Scsi_Device to the Scsi_Host - this should * Attach a single scsi_device to the Scsi_Host - this should
* be made to look like a "pseudo-device" that points to the * be made to look like a "pseudo-device" that points to the
* HA itself. * HA itself.
* *
@ -1520,7 +1520,7 @@ EXPORT_SYMBOL(scsi_get_host_dev);
* *
* Purpose: Free a scsi_device that points to the host adapter itself. * Purpose: Free a scsi_device that points to the host adapter itself.
* *
* Arguments: SHpnt - Host that needs a Scsi_Device * Arguments: SHpnt - Host that needs a scsi_device
* *
* Lock status: None assumed. * Lock status: None assumed.
* *

View File

@ -1,4 +1,3 @@
typedef struct scsi_device Scsi_Device;
typedef struct scsi_cmnd Scsi_Cmnd; typedef struct scsi_cmnd Scsi_Cmnd;
typedef struct scsi_request Scsi_Request; typedef struct scsi_request Scsi_Request;