Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can: peak_canfd: fix checkpatch warnings

Browse Source 
This patch fixes checkpatch warnings in the peak_canfd driver.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2019-10-01 21:50:20 +02:00
parent e577ba728b
commit 3cc9358fb5
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/can/peak_canfd/peak_canfd.c
View File

@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // 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) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
* *
* Copyright (C) 2016 PEAK System-Technik GmbH * 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 = pucan_add_cmd(pucan_init_cmd(priv), PUCAN_CMD_TIMING_SLOW);
cmd->sjw_t = PUCAN_TSLOW_SJW_T(pbt->sjw - 1, 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->tseg1 = PUCAN_TSLOW_TSEG1(pbt->prop_seg + pbt->phase_seg1 - 1);
cmd->tseg2 = PUCAN_TSLOW_TSEG2(pbt->phase_seg2 - 1); cmd->tseg2 = PUCAN_TSLOW_TSEG2(pbt->phase_seg2 - 1);
cmd->brp = cpu_to_le16(PUCAN_TSLOW_BRP(pbt->brp - 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 */ /* this STATUS is the CNF of the RX_BARRIER: Tx path can be setup */
if (pucan_status_is_rx_barrier(msg)) { if (pucan_status_is_rx_barrier(msg)) {
if (priv->enable_tx_path) { if (priv->enable_tx_path) {
int err = priv->enable_tx_path(priv); int err = priv->enable_tx_path(priv);

3
drivers/net/can/peak_canfd/peak_canfd_user.h
View File

@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /* CAN driver for PEAK System micro-CAN based adapters
* CAN driver for PEAK System micro-CAN based adapters
* *
* Copyright (C) 2003-2011 PEAK System-Technik GmbH * Copyright (C) 2003-2011 PEAK System-Technik GmbH
* Copyright (C) 2011-2013 Stephane Grosjean <s.grosjean@peak-system.com> * Copyright (C) 2011-2013 Stephane Grosjean <s.grosjean@peak-system.com>

6
drivers/net/can/peak_canfd/peak_pciefd_main.c
View File

@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // 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) 2012 Stephane Grosjean <s.grosjean@peak-system.com>
* *
* Derived from the PCAN project file driver/src/pcan_pci.c: * Derived from the PCAN project file driver/src/pcan_pci.c:
@ -841,7 +840,8 @@ err_disable_pci:
/* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while /* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while
* the probe() function must return a negative errno in case of failure * the probe() function must return a negative errno in case of failure
* (err is unchanged if negative) */ * (err is unchanged if negative)
*/
return pcibios_err_to_errno(err); return pcibios_err_to_errno(err);
} }