diff options
| author |   Marc Kleine-Budde <mkl@pengutronix.de> | 2019-10-04 20:22:22 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-11-11 21:58:09 +0100 |
| commit | b687a7792b9c28778f1d4359fafcec3c17147c58 (patch) | |
| tree | 4a039724a5fcc529b5cb2f00e3c61ca197844103 /drivers/net/can | |
| parent | can: peak_canfd: provide hw timestamps in rx skbs (diff) | |
| download | linux-dev-b687a7792b9c28778f1d4359fafcec3c17147c58.tar.xz linux-dev-b687a7792b9c28778f1d4359fafcec3c17147c58.zip | |
can: xilinx_can: fix checkpatch warnings
This patch fixes several checkpatch warnings.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/xilinx_can.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 7c482b2d78d2..b6fa735e47f1 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -194,7 +194,7 @@ struct xcan_devtype_data { */ struct xcan_priv { struct can_priv can; - spinlock_t tx_lock; + spinlock_t tx_lock; /* Lock for synchronizing TX interrupt handling */ unsigned int tx_head; unsigned int tx_tail; unsigned int tx_max; @@ -400,7 +400,7 @@ static int xcan_set_bittiming(struct net_device *ndev) XCAN_SR_CONFIG_MASK; if (!is_config_mode) { netdev_alert(ndev, - "BUG! Cannot set bittiming - CAN is not in config mode\n"); + "BUG! Cannot set bittiming - CAN is not in config mode\n"); return -EPERM; } @@ -482,11 +482,10 @@ static int xcan_chip_start(struct net_device *ndev) priv->write_reg(priv, XCAN_IER_OFFSET, ier); /* Check whether it is loopback mode or normal mode */ - if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) { + if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) reg_msr = XCAN_MSR_LBACK_MASK; - } else { + else reg_msr = 0x0; - } /* enable the first extended filter, if any, as cores with extended * filtering default to non-receipt if all filters are disabled |