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

Commit a2ec19f8 authored Nov 21, 2015 by Oliver Hartkopp Committed by Marc Kleine-Budde Nov 23, 2015

can: remove obsolete assignment for CAN protocol error type

The assignment 'cf->data[2] |= CAN_ERR_PROT_UNSPEC' used at CAN error message
creation time is obsolete as CAN_ERR_PROT_UNSPEC is zero and cf->data[2] is
initialized with zero in alloc_can_err_skb() anyway.

So we could either assign 'cf->data[2] = CAN_ERR_PROT_UNSPEC' correctly or we
can remove the obsolete OR operation entirely.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

parent ffd461f8

drivers/net/can/bfin_can.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -501,8 +501,6 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
		cf->data[2] \|= CAN_ERR_PROT_FORM;
		else if (status & SER)
		cf->data[2] \|= CAN_ERR_PROT_STUFF;
		else
		cf->data[2] \|= CAN_ERR_PROT_UNSPEC;
		}

		priv->can.state = state;

drivers/net/can/c_can/c_can.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -962,7 +962,6 @@ static int c_can_handle_bus_err(struct net_device *dev,
		* type of the last error to occur on the CAN bus
		*/
		cf->can_id \|= CAN_ERR_PROT \| CAN_ERR_BUSERROR;
		cf->data[2] \|= CAN_ERR_PROT_UNSPEC;

		switch (lec_type) {
		case LEC_STUFF_ERROR:

drivers/net/can/janz-ican3.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1096,7 +1096,6 @@ static int ican3_handle_cevtind(struct ican3_dev mod, struct ican3_msg msg)
		cf->data[2] \|= CAN_ERR_PROT_STUFF;
		break;
		default:
		cf->data[2] \|= CAN_ERR_PROT_UNSPEC;
		cf->data[3] = ecc & ECC_SEG;
		break;
		}

drivers/net/can/m_can/m_can.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,6 @@ static int m_can_handle_lec_err(struct net_device *dev,
		* type of the last error to occur on the CAN bus
		*/
		cf->can_id \|= CAN_ERR_PROT \| CAN_ERR_BUSERROR;
		cf->data[2] \|= CAN_ERR_PROT_UNSPEC;

		switch (lec_type) {
		case LEC_STUFF_ERROR:

drivers/net/can/rcar_can.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -241,10 +241,9 @@ static void rcar_can_error(struct net_device *ndev)
		u8 ecsr;

		netdev_dbg(priv->ndev, "Bus error interrupt:\n");
		if (skb) {
		if (skb)
		cf->can_id \|= CAN_ERR_BUSERROR \| CAN_ERR_PROT;
		cf->data[2] = CAN_ERR_PROT_UNSPEC;
		}

		ecsr = readb(&priv->regs->ecsr);
		if (ecsr & RCAR_CAN_ECSR_ADEF) {
		netdev_dbg(priv->ndev, "ACK Delimiter Error\n");