aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/fusion/lsi/mpi_log_sas.h2
-rw-r--r--drivers/message/fusion/mptctl.c8
-rw-r--r--drivers/message/fusion/mptscsih.c2
-rw-r--r--drivers/message/i2o/iop.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h
index 6be1f6b65777..af9da03e95e5 100644
--- a/drivers/message/fusion/lsi/mpi_log_sas.h
+++ b/drivers/message/fusion/lsi/mpi_log_sas.h
@@ -162,7 +162,7 @@
162#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */ 162#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */
163 /* Bit 0 is Status Bit 0: FrameXferErr */ 163 /* Bit 0 is Status Bit 0: FrameXferErr */
164 /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */ 164 /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */
165 /* Bit 3 is Status Bit 18 WriteDataLenghtGTDataLengthErr */ 165 /* Bit 3 is Status Bit 18 WriteDataLengthGTDataLengthErr */
166 166
167#define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500) 167#define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500)
168#define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600) 168#define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600)
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 6029509702d3..e630b50966ec 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1708,7 +1708,7 @@ mptctl_replace_fw (unsigned long arg)
1708 * 1708 *
1709 * Outputs: None. 1709 * Outputs: None.
1710 * Return: 0 if successful 1710 * Return: 0 if successful
1711 * -EBUSY if previous command timout and IOC reset is not complete. 1711 * -EBUSY if previous command timeout and IOC reset is not complete.
1712 * -EFAULT if data unavailable 1712 * -EFAULT if data unavailable
1713 * -ENODEV if no such device/adapter 1713 * -ENODEV if no such device/adapter
1714 * -ETIME if timer expires 1714 * -ETIME if timer expires
@@ -1748,7 +1748,7 @@ mptctl_mpt_command (unsigned long arg)
1748 * 1748 *
1749 * Outputs: None. 1749 * Outputs: None.
1750 * Return: 0 if successful 1750 * Return: 0 if successful
1751 * -EBUSY if previous command timout and IOC reset is not complete. 1751 * -EBUSY if previous command timeout and IOC reset is not complete.
1752 * -EFAULT if data unavailable 1752 * -EFAULT if data unavailable
1753 * -ENODEV if no such device/adapter 1753 * -ENODEV if no such device/adapter
1754 * -ETIME if timer expires 1754 * -ETIME if timer expires
@@ -2316,7 +2316,7 @@ done_free_mem:
2316 * Outputs: None. 2316 * Outputs: None.
2317 * Return: 0 if successful 2317 * Return: 0 if successful
2318 * -EFAULT if data unavailable 2318 * -EFAULT if data unavailable
2319 * -EBUSY if previous command timout and IOC reset is not complete. 2319 * -EBUSY if previous command timeout and IOC reset is not complete.
2320 * -ENODEV if no such device/adapter 2320 * -ENODEV if no such device/adapter
2321 * -ETIME if timer expires 2321 * -ETIME if timer expires
2322 * -ENOMEM if memory allocation error 2322 * -ENOMEM if memory allocation error
@@ -2553,7 +2553,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
2553 * Outputs: None. 2553 * Outputs: None.
2554 * Return: 0 if successful 2554 * Return: 0 if successful
2555 * -EFAULT if data unavailable 2555 * -EFAULT if data unavailable
2556 * -EBUSY if previous command timout and IOC reset is not complete. 2556 * -EBUSY if previous command timeout and IOC reset is not complete.
2557 * -ENODEV if no such device/adapter 2557 * -ENODEV if no such device/adapter
2558 * -ETIME if timer expires 2558 * -ETIME if timer expires
2559 * -ENOMEM if memory allocation error 2559 * -ENOMEM if memory allocation error
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 5c614ec38cc4..af1de0ccee2f 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1736,7 +1736,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, i
1736 fail_out: 1736 fail_out:
1737 1737
1738 /* 1738 /*
1739 * Free task managment mf, and corresponding tm flags 1739 * Free task management mf, and corresponding tm flags
1740 */ 1740 */
1741 mpt_free_msg_frame(ioc, mf); 1741 mpt_free_msg_frame(ioc, mf);
1742 hd->tmPending = 0; 1742 hd->tmPending = 0;
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 7814a06ae970..da715e11c1b2 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -916,7 +916,7 @@ static int i2o_parse_hrt(struct i2o_controller *c)
916 * status block. The status block could then be accessed through 916 * status block. The status block could then be accessed through
917 * c->status_block. 917 * c->status_block.
918 * 918 *
919 * Returns 0 on sucess or negative error code on failure. 919 * Returns 0 on success or negative error code on failure.
920 */ 920 */
921int i2o_status_get(struct i2o_controller *c) 921int i2o_status_get(struct i2o_controller *c)
922{ 922{