dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

pch_can: Change functions type

Browse source 
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>
This commit is contained in:
Tomoya 2010-12-12 20:24:13 +00:00 committed by David S. Miller
parent bd58cbc322
commit ca2b004e89
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/can/pch_can.c
View file

@ -1025,10 +1025,10 @@ static void pch_can_set_int_custom(struct pch_can_priv *priv)
} }
/* This function retrieves interrupt enabled for the CAN device. */ /* This function retrieves interrupt enabled for the CAN device. */
static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables) static u32 pch_can_get_int_enables(struct pch_can_priv *priv)
{ {
/* Obtaining the status of IE, SIE and EIE interrupt bits. */ /* Obtaining the status of IE, SIE and EIE interrupt bits. */
*enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1); return (ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1;
} }
static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, 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,
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
} }
static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv, static u32 pch_can_get_rx_buffer_link(struct pch_can_priv *priv, u32 buffer_num)
u32 buffer_num, u32 *link)
{ {
u32 link;
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num); pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB) if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
*link = 0; link = 0;
else else
*link = 1; link = 1;
return link;
} }
static int pch_can_get_buffer_status(struct pch_can_priv *priv) 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)
dev_err(&pdev->dev, "%s -> Transmission time out.\n", __func__); dev_err(&pdev->dev, "%s -> Transmission time out.\n", __func__);
/* Save interrupt configuration and then disable them */ /* Save interrupt configuration and then disable them */
pch_can_get_int_enables(priv, &(priv->int_enables)); priv->int_enables = pch_can_get_int_enables(priv);
pch_can_set_int_enables(priv, PCH_CAN_DISABLE); pch_can_set_int_enables(priv, PCH_CAN_DISABLE);
/* Save Tx buffer enable state */ /* Save Tx buffer enable state */
@ -1128,7 +1130,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
/* Save Rx buffer enable state */ /* Save Rx buffer enable state */
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) { for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG); priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG);
pch_can_get_rx_buffer_link(priv, i, &priv->rx_link[i]); priv->rx_link[i] = pch_can_get_rx_buffer_link(priv, i);
} }
/* Disable all Receive buffers */ /* Disable all Receive buffers */