can: m_can: Fix checkpatch issues on existing code
authorDan Murphy <dmurphy@ti.com>
Thu, 9 May 2019 16:11:09 +0000 (11:11 -0500)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 24 Jul 2019 08:31:54 +0000 (10:31 +0200)
Fix checkpatch issues found during the m_can framework creation, before
framework creation in the following patches.

Fix these 4 check issues:
CHECK: Unnecessary parentheses around 'cdev->can.state != CAN_STATE_ERROR_WARNING'
if (psr & PSR_EW &&
    (cdev->can.state != CAN_STATE_ERROR_WARNING)) {

CHECK: Unnecessary parentheses around 'cdev->can.state != CAN_STATE_ERROR_PASSIVE'
if ((psr & PSR_EP) &&
    (cdev->can.state != CAN_STATE_ERROR_PASSIVE)) {

CHECK: Unnecessary parentheses around 'cdev->can.state != CAN_STATE_BUS_OFF'
if ((psr & PSR_BO) &&
    (cdev->can.state != CAN_STATE_BUS_OFF)) {

CHECK: Unnecessary parentheses around 'priv->version <= 31'
if ((priv->version <= 31) && (irqstatus & IR_MRAF) &&
    (m_can_read(priv, M_CAN_ECR) & ECR_RP)) {

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Faiz Abbas <faiz_abbas@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/m_can/m_can.c

index deb274a19ba003c9061f127e28ec57521c4f877b..d387d6d0a591b2604173a76a48752591ad855279 100644 (file)
@@ -744,22 +744,19 @@ static int m_can_handle_state_errors(struct net_device *dev, u32 psr)
        struct m_can_priv *priv = netdev_priv(dev);
        int work_done = 0;
 
-       if ((psr & PSR_EW) &&
-           (priv->can.state != CAN_STATE_ERROR_WARNING)) {
+       if (psr & PSR_EW && priv->can.state != CAN_STATE_ERROR_WARNING) {
                netdev_dbg(dev, "entered error warning state\n");
                work_done += m_can_handle_state_change(dev,
                                                       CAN_STATE_ERROR_WARNING);
        }
 
-       if ((psr & PSR_EP) &&
-           (priv->can.state != CAN_STATE_ERROR_PASSIVE)) {
+       if (psr & PSR_EP && priv->can.state != CAN_STATE_ERROR_PASSIVE) {
                netdev_dbg(dev, "entered error passive state\n");
                work_done += m_can_handle_state_change(dev,
                                                       CAN_STATE_ERROR_PASSIVE);
        }
 
-       if ((psr & PSR_BO) &&
-           (priv->can.state != CAN_STATE_BUS_OFF)) {
+       if (psr & PSR_BO && priv->can.state != CAN_STATE_BUS_OFF) {
                netdev_dbg(dev, "entered error bus off state\n");
                work_done += m_can_handle_state_change(dev,
                                                       CAN_STATE_BUS_OFF);
@@ -832,8 +829,8 @@ static int m_can_poll(struct napi_struct *napi, int quota)
         * whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127.
         * In this case, reset MCAN_IR.MRAF. No further action is required.
         */
-       if ((priv->version <= 31) && (irqstatus & IR_MRAF) &&
-           (m_can_read(priv, M_CAN_ECR) & ECR_RP)) {
+       if (priv->version <= 31 && irqstatus & IR_MRAF &&
+           m_can_read(priv, M_CAN_ECR) & ECR_RP) {
                struct can_berr_counter bec;
 
                __m_can_get_berr_counter(dev, &bec);