Commit 8714fcac authored by Tomoya's avatar Tomoya Committed by David S. Miller

pch_can: Delete unnecessary/redundant code

Delete unnecessary/redundant code
Signed-off-by: default avatarTomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9388b166
...@@ -447,11 +447,6 @@ static void pch_can_release(struct pch_can_priv *priv) ...@@ -447,11 +447,6 @@ static void pch_can_release(struct pch_can_priv *priv)
/* This function clears interrupt(s) from the CAN device. */ /* This function clears interrupt(s) from the CAN device. */
static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask) static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
{ {
if (mask == PCH_STATUS_INT) {
ioread32(&priv->regs->stat);
return;
}
/* Clear interrupt for transmit object */ /* Clear interrupt for transmit object */
if ((mask >= PCH_RX_OBJ_START) && (mask <= PCH_RX_OBJ_END)) { if ((mask >= PCH_RX_OBJ_START) && (mask <= PCH_RX_OBJ_END)) {
/* Setting CMASK for clearing the reception interrupts. */ /* Setting CMASK for clearing the reception interrupts. */
...@@ -512,8 +507,6 @@ static void pch_can_error(struct net_device *ndev, u32 status) ...@@ -512,8 +507,6 @@ static void pch_can_error(struct net_device *ndev, u32 status)
state = CAN_STATE_BUS_OFF; state = CAN_STATE_BUS_OFF;
cf->can_id |= CAN_ERR_BUSOFF; cf->can_id |= CAN_ERR_BUSOFF;
can_bus_off(ndev); can_bus_off(ndev);
pch_can_set_run_mode(priv, PCH_CAN_RUN);
dev_err(&ndev->dev, "%s -> Bus Off occurres.\n", __func__);
} }
errc = ioread32(&priv->regs->errc); errc = ioread32(&priv->regs->errc);
...@@ -747,7 +740,7 @@ static int pch_can_poll(struct napi_struct *napi, int quota) ...@@ -747,7 +740,7 @@ static int pch_can_poll(struct napi_struct *napi, int quota)
if (!int_stat) if (!int_stat)
goto end; goto end;
if ((int_stat == PCH_STATUS_INT) && (quota > 0)) { if (int_stat == PCH_STATUS_INT) {
reg_stat = ioread32(&priv->regs->stat); reg_stat = ioread32(&priv->regs->stat);
if (reg_stat & (PCH_BUS_OFF | PCH_LEC_ALL)) { if (reg_stat & (PCH_BUS_OFF | PCH_LEC_ALL)) {
if (reg_stat & PCH_BUS_OFF || if (reg_stat & PCH_BUS_OFF ||
...@@ -933,10 +926,6 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -933,10 +926,6 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
priv->tx_obj++; priv->tx_obj++;
} }
/* Reading the Msg Obj from the Msg RAM to the Interface register. */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
/* Setting the CMASK register. */ /* Setting the CMASK register. */
pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL); pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment