UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

can: peak_usb: fix checkpatch warnings 

This patch cleans several checkpatch warnings in the peak_usb driver.

Link: https://lore.kernel.org/r/20210406111622.1874957-2-mkl@pengutronix.de
Acked-by: Stephane Grosjean <s.grosjean@peak-system.com>
Tested-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2021-04-05 12:34:56 +02:00
parent c664e2137a
commit bc256b9597
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/can/usb/peak_usb/pcan_usb.c
View File

@ -401,7 +401,7 @@ static int pcan_usb_update_ts(struct pcan_usb_msg_context *mc)
{ {
__le16 tmp16; __le16 tmp16;
if ((mc->ptr+2) > mc->end) if ((mc->ptr + 2) > mc->end)
return -EINVAL; return -EINVAL;
memcpy(&tmp16, mc->ptr, 2); memcpy(&tmp16, mc->ptr, 2);
@ -1039,7 +1039,7 @@ const struct peak_usb_adapter pcan_usb = {
CAN_CTRLMODE_BERR_REPORTING | CAN_CTRLMODE_BERR_REPORTING |
CAN_CTRLMODE_CC_LEN8_DLC, CAN_CTRLMODE_CC_LEN8_DLC,
.clock = { .clock = {
.freq = PCAN_USB_CRYSTAL_HZ / 2 , .freq = PCAN_USB_CRYSTAL_HZ / 2,
}, },
.bittiming_const = &pcan_usb_const, .bittiming_const = &pcan_usb_const,

1
drivers/net/can/usb/peak_usb/pcan_usb_core.c
View File

@ -624,6 +624,7 @@ static int peak_usb_ndo_stop(struct net_device *netdev)
/* can set bus off now */ /* can set bus off now */
if (dev->adapter->dev_set_bus) { if (dev->adapter->dev_set_bus) {
int err = dev->adapter->dev_set_bus(dev, 0); int err = dev->adapter->dev_set_bus(dev, 0);
if (err) if (err)
return err; return err;
} }

2
drivers/net/can/usb/peak_usb/pcan_usb_core.h
View File

@ -31,7 +31,7 @@
/* usb adapters maximum channels per usb interface */ /* usb adapters maximum channels per usb interface */
#define PCAN_USB_MAX_CHANNEL 2 #define PCAN_USB_MAX_CHANNEL 2
/* maximum length of the usb commands sent to/received from the devices */ /* maximum length of the usb commands sent to/received from the devices */
#define PCAN_USB_MAX_CMD_LEN 32 #define PCAN_USB_MAX_CMD_LEN 32
struct peak_usb_device; struct peak_usb_device;

2
drivers/net/can/usb/peak_usb/pcan_usb_pro.c
View File

@ -290,7 +290,7 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev,
pr->data_type); pr->data_type);
/* check if channel in response corresponds too */ /* check if channel in response corresponds too */
else if ((req_channel != 0xff) && \ else if ((req_channel != 0xff) &&
(pr->bus_act.channel != req_channel)) (pr->bus_act.channel != req_channel))
netdev_err(dev->netdev, netdev_err(dev->netdev,
"got rsp %xh but on chan%u: ignored\n", "got rsp %xh but on chan%u: ignored\n",