diff options
author | Tomoya <tomoya-linux@dsn.okisemi.com> | 2010-12-12 15:24:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-13 15:24:21 -0500 |
commit | ca2b004e89484e89b1815157fae2d7f933c5af9e (patch) | |
tree | 09f7838141a317b696575c416d7ac621daa72751 /drivers/net/can/pch_can.c | |
parent | bd58cbc322e97550af5e12584324b7117180435d (diff) |
pch_can: Change functions type
Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/pch_can.c')
-rw-r--r-- | drivers/net/can/pch_can.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index dd9ce16635b..c6c0842aeb7 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
@@ -1025,10 +1025,10 @@ static void pch_can_set_int_custom(struct pch_can_priv *priv) | |||
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | /* This function retrieves interrupt enabled for the CAN device. */ | 1027 | /* This function retrieves interrupt enabled for the CAN device. */ |
1028 | static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables) | 1028 | static u32 pch_can_get_int_enables(struct pch_can_priv *priv) |
1029 | { | 1029 | { |
1030 | /* Obtaining the status of IE, SIE and EIE interrupt bits. */ | 1030 | /* Obtaining the status of IE, SIE and EIE interrupt bits. */ |
1031 | *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1); | 1031 | return (ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1; |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, | 1034 | static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, |
@@ -1069,16 +1069,18 @@ static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv, | |||
1069 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); | 1069 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); |
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv, | 1072 | static u32 pch_can_get_rx_buffer_link(struct pch_can_priv *priv, u32 buffer_num) |
1073 | u32 buffer_num, u32 *link) | ||
1074 | { | 1073 | { |
1074 | u32 link; | ||
1075 | |||
1075 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); | 1076 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); |
1076 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); | 1077 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); |
1077 | 1078 | ||
1078 | if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB) | 1079 | if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB) |
1079 | *link = 0; | 1080 | link = 0; |
1080 | else | 1081 | else |
1081 | *link = 1; | 1082 | link = 1; |
1083 | return link; | ||
1082 | } | 1084 | } |
1083 | 1085 | ||
1084 | static int pch_can_get_buffer_status(struct pch_can_priv *priv) | 1086 | static int pch_can_get_buffer_status(struct pch_can_priv *priv) |
@@ -1115,7 +1117,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1115 | dev_err(&pdev->dev, "%s -> Transmission time out.\n", __func__); | 1117 | dev_err(&pdev->dev, "%s -> Transmission time out.\n", __func__); |
1116 | 1118 | ||
1117 | /* Save interrupt configuration and then disable them */ | 1119 | /* Save interrupt configuration and then disable them */ |
1118 | pch_can_get_int_enables(priv, &(priv->int_enables)); | 1120 | priv->int_enables = pch_can_get_int_enables(priv); |
1119 | pch_can_set_int_enables(priv, PCH_CAN_DISABLE); | 1121 | pch_can_set_int_enables(priv, PCH_CAN_DISABLE); |
1120 | 1122 | ||
1121 | /* Save Tx buffer enable state */ | 1123 | /* Save Tx buffer enable state */ |
@@ -1128,7 +1130,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1128 | /* Save Rx buffer enable state */ | 1130 | /* Save Rx buffer enable state */ |
1129 | for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) { | 1131 | for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) { |
1130 | priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG); | 1132 | priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG); |
1131 | pch_can_get_rx_buffer_link(priv, i, &priv->rx_link[i]); | 1133 | priv->rx_link[i] = pch_can_get_rx_buffer_link(priv, i); |
1132 | } | 1134 | } |
1133 | 1135 | ||
1134 | /* Disable all Receive buffers */ | 1136 | /* Disable all Receive buffers */ |