Skip to content

Commit

Permalink
can: remove obsolete assignment for CAN protocol error type
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Oliver Hartkopp authored and Marc Kleine-Budde committed Nov 23, 2015
1 parent ffd461f commit a2ec19f
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 17 deletions.
2 changes: 0 additions & 2 deletions drivers/net/can/bfin_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/c_can/c_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/janz-ican3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/m_can/m_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/can/rcar_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/sja1000/sja1000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = ecc & ECC_SEG;
break;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/sun4i_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = (ecc & SUN4I_STA_ERR_SEG_CODE)
>> 16;
break;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/ti_hecc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,6 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
if (err_status & HECC_BUS_ERROR) {
++priv->can.can_stats.bus_error;
cf->can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT;
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
if (err_status & HECC_CANES_FE) {
hecc_set_bit(priv, HECC_CANES, HECC_CANES_FE);
cf->data[2] |= CAN_ERR_PROT_FORM;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/usb/ems_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = ecc & SJA1000_ECC_SEG;
break;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/usb/esd_usb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = ecc & SJA1000_ECC_SEG;
break;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/net/can/usb/usb_8dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv,
tx_errors = 1;
break;
case USB_8DEV_STATUSMSG_CRC:
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;
rx_errors = 1;
break;
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/can/xilinx_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,8 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)

/* Check for error interrupt */
if (isr & XCAN_IXR_ERROR_MASK) {
if (skb) {
if (skb)
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
cf->data[2] |= CAN_ERR_PROT_UNSPEC;
}

/* Check for Ack error interrupt */
if (err_status & XCAN_ESR_ACKER_MASK) {
Expand Down

0 comments on commit a2ec19f

Please sign in to comment.