diff options
-rw-r--r-- | drivers/message/fusion/mptsas.c | 16 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 88a1a6d3bc04..14c490a767a4 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
@@ -636,8 +636,7 @@ mptsas_add_device_component_by_fw(MPT_ADAPTER *ioc, u8 channel, u8 id) | |||
636 | } | 636 | } |
637 | 637 | ||
638 | /** | 638 | /** |
639 | * mptsas_add_device_component_starget_ir - Handle Integrated RAID, adding | 639 | * mptsas_add_device_component_starget_ir - Handle Integrated RAID, adding each individual device to list |
640 | * each individual device to list | ||
641 | * @ioc: Pointer to MPT_ADAPTER structure | 640 | * @ioc: Pointer to MPT_ADAPTER structure |
642 | * @channel: fw mapped id's | 641 | * @channel: fw mapped id's |
643 | * @id: | 642 | * @id: |
@@ -776,8 +775,7 @@ mptsas_add_device_component_starget(MPT_ADAPTER *ioc, | |||
776 | } | 775 | } |
777 | 776 | ||
778 | /** | 777 | /** |
779 | * mptsas_del_device_component_by_os - Once a device has been removed, we | 778 | * mptsas_del_device_component_by_os - Once a device has been removed, we mark the entry in the list as being cached |
780 | * mark the entry in the list as being cached | ||
781 | * @ioc: Pointer to MPT_ADAPTER structure | 779 | * @ioc: Pointer to MPT_ADAPTER structure |
782 | * @channel: os mapped id's | 780 | * @channel: os mapped id's |
783 | * @id: | 781 | * @id: |
@@ -1125,11 +1123,12 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc, | |||
1125 | } | 1123 | } |
1126 | 1124 | ||
1127 | /** | 1125 | /** |
1128 | * mptsas_taskmgmt_complete - Completion for TARGET_RESET after | 1126 | * mptsas_taskmgmt_complete - complete SAS task management function |
1129 | * NOT_RESPONDING_EVENT, enable work queue to finish off removing device | ||
1130 | * from upper layers. then send next TARGET_RESET in the queue. | ||
1131 | * @ioc: Pointer to MPT_ADAPTER structure | 1127 | * @ioc: Pointer to MPT_ADAPTER structure |
1132 | * | 1128 | * |
1129 | * Completion for TARGET_RESET after NOT_RESPONDING_EVENT, enable work | ||
1130 | * queue to finish off removing device from upper layers. then send next | ||
1131 | * TARGET_RESET in the queue. | ||
1133 | **/ | 1132 | **/ |
1134 | static int | 1133 | static int |
1135 | mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) | 1134 | mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) |
@@ -1441,8 +1440,7 @@ mptsas_add_end_device(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info) | |||
1441 | } | 1440 | } |
1442 | 1441 | ||
1443 | /** | 1442 | /** |
1444 | * mptsas_del_end_device - report a deleted end device to sas transport | 1443 | * mptsas_del_end_device - report a deleted end device to sas transport layer |
1445 | * layer | ||
1446 | * @ioc: Pointer to MPT_ADAPTER structure | 1444 | * @ioc: Pointer to MPT_ADAPTER structure |
1447 | * @phy_info: decribes attached device | 1445 | * @phy_info: decribes attached device |
1448 | * | 1446 | * |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 96681203d4a9..024e8305bcf2 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -2442,10 +2442,7 @@ mptscsih_get_scsi_lookup(MPT_ADAPTER *ioc, int i) | |||
2442 | EXPORT_SYMBOL(mptscsih_get_scsi_lookup); | 2442 | EXPORT_SYMBOL(mptscsih_get_scsi_lookup); |
2443 | 2443 | ||
2444 | /** | 2444 | /** |
2445 | * mptscsih_getclear_scsi_lookup | 2445 | * mptscsih_getclear_scsi_lookup - retrieves and clears scmd entry from ScsiLookup[] array list |
2446 | * | ||
2447 | * retrieves and clears scmd entry from ScsiLookup[] array list | ||
2448 | * | ||
2449 | * @ioc: Pointer to MPT_ADAPTER structure | 2446 | * @ioc: Pointer to MPT_ADAPTER structure |
2450 | * @i: index into the array | 2447 | * @i: index into the array |
2451 | * | 2448 | * |