diff options
author | Christoph Hellwig <hch@lst.de> | 2005-10-31 12:32:08 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-09 15:48:20 -0500 |
commit | f64a181d898e0518d5ae90c4870069510de977e1 (patch) | |
tree | f7ef817d9bd1804e59220f70d97c2ae6f5f7a2f5 /drivers/scsi/scsi_scan.c | |
parent | 0a04137e75204e370dbdf2376033853eea126de7 (diff) |
[SCSI] remove Scsi_Device typedef
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r-- | drivers/scsi/scsi_scan.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 27bcc8fb8cbc..374853df9cca 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * global variable (boot or module load time) settings. | 9 | * global variable (boot or module load time) settings. |
10 | * | 10 | * |
11 | * A specific LUN is scanned via an INQUIRY command; if the LUN has a | 11 | * A specific LUN is scanned via an INQUIRY command; if the LUN has a |
12 | * device attached, a Scsi_Device is allocated and setup for it. | 12 | * device attached, a scsi_device is allocated and setup for it. |
13 | * | 13 | * |
14 | * For every id of every channel on the given host: | 14 | * For every id of every channel on the given host: |
15 | * | 15 | * |
@@ -17,7 +17,7 @@ | |||
17 | * device or storage attached to LUN 0): | 17 | * device or storage attached to LUN 0): |
18 | * | 18 | * |
19 | * If LUN 0 has a device attached, allocate and setup a | 19 | * If LUN 0 has a device attached, allocate and setup a |
20 | * Scsi_Device for it. | 20 | * scsi_device for it. |
21 | * | 21 | * |
22 | * If target is SCSI-3 or up, issue a REPORT LUN, and scan | 22 | * If target is SCSI-3 or up, issue a REPORT LUN, and scan |
23 | * all of the LUNs returned by the REPORT LUN; else, | 23 | * all of the LUNs returned by the REPORT LUN; else, |
@@ -441,7 +441,7 @@ void scsi_target_reap(struct scsi_target *starget) | |||
441 | * | 441 | * |
442 | * If the INQUIRY is successful, zero is returned and the | 442 | * If the INQUIRY is successful, zero is returned and the |
443 | * INQUIRY data is in @inq_result; the scsi_level and INQUIRY length | 443 | * INQUIRY data is in @inq_result; the scsi_level and INQUIRY length |
444 | * are copied to the Scsi_Device any flags value is stored in *@bflags. | 444 | * are copied to the scsi_device any flags value is stored in *@bflags. |
445 | **/ | 445 | **/ |
446 | static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result, | 446 | static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result, |
447 | int result_len, int *bflags) | 447 | int result_len, int *bflags) |
@@ -509,8 +509,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result, | |||
509 | /* | 509 | /* |
510 | * Get any flags for this device. | 510 | * Get any flags for this device. |
511 | * | 511 | * |
512 | * XXX add a bflags to Scsi_Device, and replace the | 512 | * XXX add a bflags to scsi_device, and replace the |
513 | * corresponding bit fields in Scsi_Device, so bflags | 513 | * corresponding bit fields in scsi_device, so bflags |
514 | * need not be passed as an argument. | 514 | * need not be passed as an argument. |
515 | */ | 515 | */ |
516 | *bflags = scsi_get_device_flags(sdev, &inq_result[8], | 516 | *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, | |||
592 | } | 592 | } |
593 | 593 | ||
594 | /** | 594 | /** |
595 | * scsi_add_lun - allocate and fully initialze a Scsi_Device | 595 | * scsi_add_lun - allocate and fully initialze a scsi_device |
596 | * @sdevscan: holds information to be stored in the new Scsi_Device | 596 | * @sdevscan: holds information to be stored in the new scsi_device |
597 | * @sdevnew: store the address of the newly allocated Scsi_Device | 597 | * @sdevnew: store the address of the newly allocated scsi_device |
598 | * @inq_result: holds the result of a previous INQUIRY to the LUN | 598 | * @inq_result: holds the result of a previous INQUIRY to the LUN |
599 | * @bflags: black/white list flag | 599 | * @bflags: black/white list flag |
600 | * | 600 | * |
601 | * Description: | 601 | * Description: |
602 | * Allocate and initialize a Scsi_Device matching sdevscan. Optionally | 602 | * Allocate and initialize a scsi_device matching sdevscan. Optionally |
603 | * set fields based on values in *@bflags. If @sdevnew is not | 603 | * set fields based on values in *@bflags. If @sdevnew is not |
604 | * NULL, store the address of the new Scsi_Device in *@sdevnew (needed | 604 | * NULL, store the address of the new scsi_device in *@sdevnew (needed |
605 | * when scanning a particular LUN). | 605 | * when scanning a particular LUN). |
606 | * | 606 | * |
607 | * Return: | 607 | * Return: |
608 | * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device | 608 | * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device |
609 | * SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized | 609 | * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized |
610 | **/ | 610 | **/ |
611 | static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) | 611 | static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) |
612 | { | 612 | { |
@@ -674,7 +674,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) | |||
674 | * | 674 | * |
675 | * The above is vague, as it implies that we could treat 001 and | 675 | * The above is vague, as it implies that we could treat 001 and |
676 | * 011 the same. Stay compatible with previous code, and create a | 676 | * 011 the same. Stay compatible with previous code, and create a |
677 | * Scsi_Device for a PQ of 1 | 677 | * scsi_device for a PQ of 1 |
678 | * | 678 | * |
679 | * Don't set the device offline here; rather let the upper | 679 | * Don't set the device offline here; rather let the upper |
680 | * level drivers eval the PQ to decide whether they should | 680 | * level drivers eval the PQ to decide whether they should |
@@ -784,8 +784,8 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev) | |||
784 | * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it | 784 | * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it |
785 | * @starget: pointer to target device structure | 785 | * @starget: pointer to target device structure |
786 | * @lun: LUN of target device | 786 | * @lun: LUN of target device |
787 | * @sdevscan: probe the LUN corresponding to this Scsi_Device | 787 | * @sdevscan: probe the LUN corresponding to this scsi_device |
788 | * @sdevnew: store the value of any new Scsi_Device allocated | 788 | * @sdevnew: store the value of any new scsi_device allocated |
789 | * @bflagsp: store bflags here if not NULL | 789 | * @bflagsp: store bflags here if not NULL |
790 | * | 790 | * |
791 | * Description: | 791 | * Description: |
@@ -793,10 +793,10 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev) | |||
793 | * allocate and set it up by calling scsi_add_lun. | 793 | * allocate and set it up by calling scsi_add_lun. |
794 | * | 794 | * |
795 | * Return: | 795 | * Return: |
796 | * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device | 796 | * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device |
797 | * SCSI_SCAN_TARGET_PRESENT: target responded, but no device is | 797 | * SCSI_SCAN_TARGET_PRESENT: target responded, but no device is |
798 | * attached at the LUN | 798 | * attached at the LUN |
799 | * SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized | 799 | * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized |
800 | **/ | 800 | **/ |
801 | static int scsi_probe_and_add_lun(struct scsi_target *starget, | 801 | static int scsi_probe_and_add_lun(struct scsi_target *starget, |
802 | uint lun, int *bflagsp, | 802 | uint lun, int *bflagsp, |
@@ -1046,7 +1046,7 @@ EXPORT_SYMBOL(int_to_scsilun); | |||
1046 | 1046 | ||
1047 | /** | 1047 | /** |
1048 | * scsi_report_lun_scan - Scan using SCSI REPORT LUN results | 1048 | * scsi_report_lun_scan - Scan using SCSI REPORT LUN results |
1049 | * @sdevscan: scan the host, channel, and id of this Scsi_Device | 1049 | * @sdevscan: scan the host, channel, and id of this scsi_device |
1050 | * | 1050 | * |
1051 | * Description: | 1051 | * Description: |
1052 | * If @sdevscan is for a SCSI-3 or up device, send a REPORT LUN | 1052 | * 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) | |||
1474 | /* | 1474 | /* |
1475 | * Function: scsi_get_host_dev() | 1475 | * Function: scsi_get_host_dev() |
1476 | * | 1476 | * |
1477 | * Purpose: Create a Scsi_Device that points to the host adapter itself. | 1477 | * Purpose: Create a scsi_device that points to the host adapter itself. |
1478 | * | 1478 | * |
1479 | * Arguments: SHpnt - Host that needs a Scsi_Device | 1479 | * Arguments: SHpnt - Host that needs a scsi_device |
1480 | * | 1480 | * |
1481 | * Lock status: None assumed. | 1481 | * Lock status: None assumed. |
1482 | * | 1482 | * |
1483 | * Returns: The Scsi_Device or NULL | 1483 | * Returns: The scsi_device or NULL |
1484 | * | 1484 | * |
1485 | * Notes: | 1485 | * Notes: |
1486 | * Attach a single Scsi_Device to the Scsi_Host - this should | 1486 | * Attach a single scsi_device to the Scsi_Host - this should |
1487 | * be made to look like a "pseudo-device" that points to the | 1487 | * be made to look like a "pseudo-device" that points to the |
1488 | * HA itself. | 1488 | * HA itself. |
1489 | * | 1489 | * |
@@ -1520,7 +1520,7 @@ EXPORT_SYMBOL(scsi_get_host_dev); | |||
1520 | * | 1520 | * |
1521 | * Purpose: Free a scsi_device that points to the host adapter itself. | 1521 | * Purpose: Free a scsi_device that points to the host adapter itself. |
1522 | * | 1522 | * |
1523 | * Arguments: SHpnt - Host that needs a Scsi_Device | 1523 | * Arguments: SHpnt - Host that needs a scsi_device |
1524 | * | 1524 | * |
1525 | * Lock status: None assumed. | 1525 | * Lock status: None assumed. |
1526 | * | 1526 | * |