diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-10-01 21:50:20 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-11-11 21:58:08 +0100 |
| commit | 3cc9358fb51f160e78746fce4adb60b913fb5cc1 (patch) | |
| tree | 5ad606519d5dcaec8974bbe0b6b773d30c276b93 /drivers/net/can/peak_canfd/peak_canfd.c | |
| parent | e577ba728bf50ea0b6b9b9a833d75fa45ed9a26a (diff) | |
| download | linux-stable-3cc9358fb51f160e78746fce4adb60b913fb5cc1.tar.gz linux-stable-3cc9358fb51f160e78746fce4adb60b913fb5cc1.tar.bz2 linux-stable-3cc9358fb51f160e78746fce4adb60b913fb5cc1.zip | |
can: peak_canfd: fix checkpatch warnings
This patch fixes checkpatch warnings in the peak_canfd driver.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/peak_canfd/peak_canfd.c')
| -rw-r--r-- | drivers/net/can/peak_canfd/peak_canfd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c index 6b0c6a99fc8d..1ffcd63f5a86 100644 --- a/drivers/net/can/peak_canfd/peak_canfd.c +++ b/drivers/net/can/peak_canfd/peak_canfd.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com> +/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com> * Copyright (C) 2012 Stephane Grosjean <s.grosjean@peak-system.com> * * Copyright (C) 2016 PEAK System-Technik GmbH @@ -122,7 +121,8 @@ static int pucan_set_timing_slow(struct peak_canfd_priv *priv, cmd = pucan_add_cmd(pucan_init_cmd(priv), PUCAN_CMD_TIMING_SLOW); cmd->sjw_t = PUCAN_TSLOW_SJW_T(pbt->sjw - 1, - priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES); + priv->can.ctrlmode & + CAN_CTRLMODE_3_SAMPLES); cmd->tseg1 = PUCAN_TSLOW_TSEG1(pbt->prop_seg + pbt->phase_seg1 - 1); cmd->tseg2 = PUCAN_TSLOW_TSEG2(pbt->phase_seg2 - 1); cmd->brp = cpu_to_le16(PUCAN_TSLOW_BRP(pbt->brp - 1)); @@ -325,7 +325,6 @@ static int pucan_handle_status(struct peak_canfd_priv *priv, /* this STATUS is the CNF of the RX_BARRIER: Tx path can be setup */ if (pucan_status_is_rx_barrier(msg)) { - if (priv->enable_tx_path) { int err = priv->enable_tx_path(priv); |