2 files changed, 18 insertions, 21 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 0c303c84b37b..6b6df8679585 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -632,8 +632,7 @@ mpt_deregister(u8 cb_idx)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
- *      mpt_event_register - Register protocol-specific event callback
- *      handler.
+ *      mpt_event_register - Register protocol-specific event callback handler.
  *      @cb_idx: previously registered (via mpt_register) callback handle
  *      @ev_cbfunc: callback function
  *
@@ -654,8 +653,7 @@ mpt_event_register(u8 cb_idx, MPT_EVHANDLER ev_cbfunc)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
- *      mpt_event_deregister - Deregister protocol-specific event callback
- *      handler.
+ *      mpt_event_deregister - Deregister protocol-specific event callback handler
  *      @cb_idx: previously registered callback handle
  *
  *      Each protocol-specific driver should call this routine
@@ -765,11 +763,13 @@ mpt_device_driver_deregister(u8 cb_idx)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
- *      mpt_get_msg_frame - Obtain a MPT request frame from the pool (of 1024)
- *      allocated per MPT adapter.
+ *      mpt_get_msg_frame - Obtain an MPT request frame from the pool
  *      @cb_idx: Handle of registered MPT protocol driver
  *      @ioc: Pointer to MPT adapter structure
  *
+ *      Obtain an MPT request frame from the pool (of 1024) that are
+ *      allocated per MPT adapter.
+ *
  *      Returns pointer to a MPT request frame or %NULL if none are available
  *      or IOC is not active.
  */
@@ -834,13 +834,12 @@ mpt_get_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
- *      mpt_put_msg_frame - Send a protocol specific MPT request frame
- *      to a IOC.
+ *      mpt_put_msg_frame - Send a protocol-specific MPT request frame to an IOC
  *      @cb_idx: Handle of registered MPT protocol driver
  *      @ioc: Pointer to MPT adapter structure
  *      @mf: Pointer to MPT request frame
  *
- *      This routine posts a MPT request frame to the request post FIFO of a
+ *      This routine posts an MPT request frame to the request post FIFO of a
  *      specific MPT adapter.
  */
 void
@@ -868,13 +867,15 @@ mpt_put_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
 }
 
 /**
- *      mpt_put_msg_frame_hi_pri - Send a protocol specific MPT request frame
- *      to a IOC using hi priority request queue.
+ *      mpt_put_msg_frame_hi_pri - Send a hi-pri protocol-specific MPT request frame
  *      @cb_idx: Handle of registered MPT protocol driver
  *      @ioc: Pointer to MPT adapter structure
  *      @mf: Pointer to MPT request frame
  *
- *      This routine posts a MPT request frame to the request post FIFO of a
+ *      Send a protocol-specific MPT request frame to an IOC using
+ *      hi-priority request queue.
+ *
+ *      This routine posts an MPT request frame to the request post FIFO of a
  *      specific MPT adapter.
  **/
 void
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index af1de0ccee2f..0c252f60c4c1 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1533,7 +1533,7 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
  *
  *      Remark: Currently invoked from a non-interrupt thread (_bh).
  *
- *      Remark: With old EH code, at most 1 SCSI TaskMgmt function per IOC
+ *      Note: With old EH code, at most 1 SCSI TaskMgmt function per IOC
  *      will be active.
  *
  *      Returns 0 for SUCCESS, or %FAILED.
@@ -2537,14 +2537,12 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR
 
 /**
  * mptscsih_get_scsi_lookup
- *
- * retrieves scmd entry from ScsiLookup[] array list
- *
  * @ioc: Pointer to MPT_ADAPTER structure
  * @i: index into the array
  *
- * Returns the scsi_cmd pointer
+ * retrieves scmd entry from ScsiLookup[] array list
  *
+ * Returns the scsi_cmd pointer
  **/
 static struct scsi_cmnd *
 mptscsih_get_scsi_lookup(MPT_ADAPTER *ioc, int i)
@@ -2561,14 +2559,12 @@ mptscsih_get_scsi_lookup(MPT_ADAPTER *ioc, int i)
 
 /**
  * mptscsih_getclear_scsi_lookup
- *
- * retrieves and clears scmd entry from ScsiLookup[] array list
- *
  * @ioc: Pointer to MPT_ADAPTER structure
  * @i: index into the array
  *
- * Returns the scsi_cmd pointer
+ * retrieves and clears scmd entry from ScsiLookup[] array list
  *
+ * Returns the scsi_cmd pointer
  **/
 static struct scsi_cmnd *
 mptscsih_getclear_scsi_lookup(MPT_ADAPTER *ioc, int i)