Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2b004e authored by Tomoya's avatar Tomoya Committed by David S. Miller
Browse files

pch_can: Change functions type 



Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec

Signed-off-by: default avatarTomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd58cbc3

drivers/net/can/pch_can.c

+10 −8
Original line number Diff line number Diff line
@@ -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. */

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. */

	*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,
@@ -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);

}



static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,

				       u32 buffer_num, u32 *link)

static u32 pch_can_get_rx_buffer_link(struct pch_can_priv *priv, u32 buffer_num)

{

	u32 link;



	iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);

	pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);



	if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)

		*link = 0;

		link = 0;

	else

		*link = 1;

		link = 1;

	return link;

}



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__);



	/* 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);



	/* 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 */

	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);

		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 */