diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-02-20 14:17:03 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-03-20 11:47:23 -0400 |
commit | 1544d67738c864245b8a061fb72093daeea8d4f1 (patch) | |
tree | f88c5fb4e9a1fbff7b2fbfad28c70a2327b1836b /drivers/message | |
parent | 56937f7b78d3e495a9f557775f3c3ea1d50ca7b3 (diff) |
[SCSI] fusion: kernel-doc warning fixes
Fix kernel-doc warnings in fusion driver code.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: "Moore, Eric" <Eric.Moore@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 22 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 15 | ||||
-rw-r--r-- | drivers/message/fusion/mptspi.c | 11 |
3 files changed, 22 insertions, 26 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 083acfd91d8b..0a2d7db7b634 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -4739,12 +4739,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum) | |||
4739 | } | 4739 | } |
4740 | 4740 | ||
4741 | /** | 4741 | /** |
4742 | * mpt_inactive_raid_list_free | 4742 | * mpt_inactive_raid_list_free - This clears this link list. |
4743 | * | 4743 | * @ioc : pointer to per adapter structure |
4744 | * This clears this link list. | ||
4745 | * | ||
4746 | * @ioc - pointer to per adapter structure | ||
4747 | * | ||
4748 | **/ | 4744 | **/ |
4749 | static void | 4745 | static void |
4750 | mpt_inactive_raid_list_free(MPT_ADAPTER *ioc) | 4746 | mpt_inactive_raid_list_free(MPT_ADAPTER *ioc) |
@@ -4764,15 +4760,11 @@ mpt_inactive_raid_list_free(MPT_ADAPTER *ioc) | |||
4764 | } | 4760 | } |
4765 | 4761 | ||
4766 | /** | 4762 | /** |
4767 | * mpt_inactive_raid_volumes | 4763 | * mpt_inactive_raid_volumes - sets up link list of phy_disk_nums for devices belonging in an inactive volume |
4768 | * | ||
4769 | * This sets up link list of phy_disk_nums for devices belonging in an inactive volume | ||
4770 | * | ||
4771 | * @ioc - pointer to per adapter structure | ||
4772 | * @channel - volume channel | ||
4773 | * @id - volume target id | ||
4774 | * | ||
4775 | * | 4764 | * |
4765 | * @ioc : pointer to per adapter structure | ||
4766 | * @channel : volume channel | ||
4767 | * @id : volume target id | ||
4776 | **/ | 4768 | **/ |
4777 | static void | 4769 | static void |
4778 | mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id) | 4770 | mpt_inactive_raid_volumes(MPT_ADAPTER *ioc, u8 channel, u8 id) |
@@ -6663,7 +6655,7 @@ union loginfo_type { | |||
6663 | /** | 6655 | /** |
6664 | * mpt_iocstatus_info_config - IOCSTATUS information for config pages | 6656 | * mpt_iocstatus_info_config - IOCSTATUS information for config pages |
6665 | * @ioc: Pointer to MPT_ADAPTER structure | 6657 | * @ioc: Pointer to MPT_ADAPTER structure |
6666 | * ioc_status: U32 IOCStatus word from IOC | 6658 | * @ioc_status: U32 IOCStatus word from IOC |
6667 | * @mf: Pointer to MPT request frame | 6659 | * @mf: Pointer to MPT request frame |
6668 | * | 6660 | * |
6669 | * Refer to lsi/mpi.h. | 6661 | * Refer to lsi/mpi.h. |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 2a3e9e66d4ef..eef00ed139b9 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -1537,21 +1537,23 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx) | |||
1537 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 1537 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
1538 | /** | 1538 | /** |
1539 | * mptscsih_TMHandler - Generic handler for SCSI Task Management. | 1539 | * mptscsih_TMHandler - Generic handler for SCSI Task Management. |
1540 | * Fall through to mpt_HardResetHandler if: not operational, too many | 1540 | * @hd: Pointer to MPT SCSI HOST structure |
1541 | * failed TM requests or handshake failure. | ||
1542 | * | ||
1543 | * @ioc: Pointer to MPT_ADAPTER structure | ||
1544 | * @type: Task Management type | 1541 | * @type: Task Management type |
1542 | * @channel: channel number for task management | ||
1545 | * @id: Logical Target ID for reset (if appropriate) | 1543 | * @id: Logical Target ID for reset (if appropriate) |
1546 | * @lun: Logical Unit for reset (if appropriate) | 1544 | * @lun: Logical Unit for reset (if appropriate) |
1547 | * @ctx2abort: Context for the task to be aborted (if appropriate) | 1545 | * @ctx2abort: Context for the task to be aborted (if appropriate) |
1546 | * @timeout: timeout for task management control | ||
1547 | * | ||
1548 | * Fall through to mpt_HardResetHandler if: not operational, too many | ||
1549 | * failed TM requests or handshake failure. | ||
1548 | * | 1550 | * |
1549 | * Remark: Currently invoked from a non-interrupt thread (_bh). | 1551 | * Remark: Currently invoked from a non-interrupt thread (_bh). |
1550 | * | 1552 | * |
1551 | * Remark: With old EH code, at most 1 SCSI TaskMgmt function per IOC | 1553 | * Remark: With old EH code, at most 1 SCSI TaskMgmt function per IOC |
1552 | * will be active. | 1554 | * will be active. |
1553 | * | 1555 | * |
1554 | * Returns 0 for SUCCESS, or FAILED. | 1556 | * Returns 0 for SUCCESS, or %FAILED. |
1555 | **/ | 1557 | **/ |
1556 | int | 1558 | int |
1557 | mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout) | 1559 | mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout) |
@@ -1650,9 +1652,11 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int c | |||
1650 | * mptscsih_IssueTaskMgmt - Generic send Task Management function. | 1652 | * mptscsih_IssueTaskMgmt - Generic send Task Management function. |
1651 | * @hd: Pointer to MPT_SCSI_HOST structure | 1653 | * @hd: Pointer to MPT_SCSI_HOST structure |
1652 | * @type: Task Management type | 1654 | * @type: Task Management type |
1655 | * @channel: channel number for task management | ||
1653 | * @id: Logical Target ID for reset (if appropriate) | 1656 | * @id: Logical Target ID for reset (if appropriate) |
1654 | * @lun: Logical Unit for reset (if appropriate) | 1657 | * @lun: Logical Unit for reset (if appropriate) |
1655 | * @ctx2abort: Context for the task to be aborted (if appropriate) | 1658 | * @ctx2abort: Context for the task to be aborted (if appropriate) |
1659 | * @timeout: timeout for task management control | ||
1656 | * | 1660 | * |
1657 | * Remark: _HardResetHandler can be invoked from an interrupt thread (timer) | 1661 | * Remark: _HardResetHandler can be invoked from an interrupt thread (timer) |
1658 | * or a non-interrupt thread. In the former, must not call schedule(). | 1662 | * or a non-interrupt thread. In the former, must not call schedule(). |
@@ -2022,6 +2026,7 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd) | |||
2022 | /** | 2026 | /** |
2023 | * mptscsih_tm_wait_for_completion - wait for completion of TM task | 2027 | * mptscsih_tm_wait_for_completion - wait for completion of TM task |
2024 | * @hd: Pointer to MPT host structure. | 2028 | * @hd: Pointer to MPT host structure. |
2029 | * @timeout: timeout value | ||
2025 | * | 2030 | * |
2026 | * Returns {SUCCESS,FAILED}. | 2031 | * Returns {SUCCESS,FAILED}. |
2027 | */ | 2032 | */ |
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 85f21b54cb7d..755dec6b7acc 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
@@ -96,14 +96,13 @@ static int mptspiTaskCtx = -1; | |||
96 | static int mptspiInternalCtx = -1; /* Used only for internal commands */ | 96 | static int mptspiInternalCtx = -1; /* Used only for internal commands */ |
97 | 97 | ||
98 | /** | 98 | /** |
99 | * mptspi_setTargetNegoParms - Update the target negotiation | 99 | * mptspi_setTargetNegoParms - Update the target negotiation parameters |
100 | * parameters based on the the Inquiry data, adapter capabilities, | ||
101 | * and NVRAM settings | ||
102 | * | ||
103 | * @hd: Pointer to a SCSI Host Structure | 100 | * @hd: Pointer to a SCSI Host Structure |
104 | * @vtarget: per target private data | 101 | * @target: per target private data |
105 | * @sdev: SCSI device | 102 | * @sdev: SCSI device |
106 | * | 103 | * |
104 | * Update the target negotiation parameters based on the the Inquiry | ||
105 | * data, adapter capabilities, and NVRAM settings. | ||
107 | **/ | 106 | **/ |
108 | static void | 107 | static void |
109 | mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, | 108 | mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, |
@@ -234,7 +233,7 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target, | |||
234 | /** | 233 | /** |
235 | * mptspi_writeIOCPage4 - write IOC Page 4 | 234 | * mptspi_writeIOCPage4 - write IOC Page 4 |
236 | * @hd: Pointer to a SCSI Host Structure | 235 | * @hd: Pointer to a SCSI Host Structure |
237 | * @channel: | 236 | * @channel: channel number |
238 | * @id: write IOC Page4 for this ID & Bus | 237 | * @id: write IOC Page4 for this ID & Bus |
239 | * | 238 | * |
240 | * Return: -EAGAIN if unable to obtain a Message Frame | 239 | * Return: -EAGAIN if unable to obtain a Message Frame |