@@ -744,22 +744,19 @@ static int m_can_handle_state_errors(struct net_device *dev, u32 psr)
744
744
struct m_can_priv * priv = netdev_priv (dev );
745
745
int work_done = 0 ;
746
746
747
- if ((psr & PSR_EW ) &&
748
- (priv -> can .state != CAN_STATE_ERROR_WARNING )) {
747
+ if (psr & PSR_EW && priv -> can .state != CAN_STATE_ERROR_WARNING ) {
749
748
netdev_dbg (dev , "entered error warning state\n" );
750
749
work_done += m_can_handle_state_change (dev ,
751
750
CAN_STATE_ERROR_WARNING );
752
751
}
753
752
754
- if ((psr & PSR_EP ) &&
755
- (priv -> can .state != CAN_STATE_ERROR_PASSIVE )) {
753
+ if (psr & PSR_EP && priv -> can .state != CAN_STATE_ERROR_PASSIVE ) {
756
754
netdev_dbg (dev , "entered error passive state\n" );
757
755
work_done += m_can_handle_state_change (dev ,
758
756
CAN_STATE_ERROR_PASSIVE );
759
757
}
760
758
761
- if ((psr & PSR_BO ) &&
762
- (priv -> can .state != CAN_STATE_BUS_OFF )) {
759
+ if (psr & PSR_BO && priv -> can .state != CAN_STATE_BUS_OFF ) {
763
760
netdev_dbg (dev , "entered error bus off state\n" );
764
761
work_done += m_can_handle_state_change (dev ,
765
762
CAN_STATE_BUS_OFF );
@@ -832,8 +829,8 @@ static int m_can_poll(struct napi_struct *napi, int quota)
832
829
* whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127.
833
830
* In this case, reset MCAN_IR.MRAF. No further action is required.
834
831
*/
835
- if (( priv -> version <= 31 ) && ( irqstatus & IR_MRAF ) &&
836
- ( m_can_read (priv , M_CAN_ECR ) & ECR_RP ) ) {
832
+ if (priv -> version <= 31 && irqstatus & IR_MRAF &&
833
+ m_can_read (priv , M_CAN_ECR ) & ECR_RP ) {
837
834
struct can_berr_counter bec ;
838
835
839
836
__m_can_get_berr_counter (dev , & bec );
0 commit comments