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

can: kvaser_usb: Replace USB timeout constants with one define 

Replace USB timeout constants used when sending and receiving, with a
single constant.

Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Jimmy Assarsson 2018-07-18 23:29:21 +02:00 committed by Marc Kleine-Budde
parent f741f93855
commit 75d2b4c3e3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/can/usb/kvaser_usb.c
View File

@ -26,10 +26,7 @@
#include <linux/can/error.h> #include <linux/can/error.h>
#define MAX_RX_URBS 4 #define MAX_RX_URBS 4
#define START_TIMEOUT 1000 /* msecs */ #define KVASER_USB_TIMEOUT 1000 /* msecs */
#define STOP_TIMEOUT 1000 /* msecs */
#define USB_SEND_TIMEOUT 1000 /* msecs */
#define USB_RECV_TIMEOUT 1000 /* msecs */
#define RX_BUFFER_SIZE 3072 #define RX_BUFFER_SIZE 3072
#define CAN_USB_CLOCK 8000000 #define CAN_USB_CLOCK 8000000
#define MAX_NET_DEVICES 3 #define MAX_NET_DEVICES 3
@ -529,8 +526,7 @@ static inline int kvaser_usb_send_cmd(const struct kvaser_usb *dev,
return usb_bulk_msg(dev->udev, return usb_bulk_msg(dev->udev,
usb_sndbulkpipe(dev->udev, usb_sndbulkpipe(dev->udev,
dev->bulk_out->bEndpointAddress), dev->bulk_out->bEndpointAddress),
cmd, cmd->len, &actual_len, cmd, cmd->len, &actual_len, KVASER_USB_TIMEOUT);
USB_SEND_TIMEOUT);
} }
static int kvaser_usb_wait_cmd(const struct kvaser_usb *dev, u8 id, static int kvaser_usb_wait_cmd(const struct kvaser_usb *dev, u8 id,
@ -541,7 +537,7 @@ static int kvaser_usb_wait_cmd(const struct kvaser_usb *dev, u8 id,
int actual_len; int actual_len;
int err; int err;
int pos; int pos;
unsigned long to = jiffies + msecs_to_jiffies(USB_RECV_TIMEOUT); unsigned long to = jiffies + msecs_to_jiffies(KVASER_USB_TIMEOUT);
buf = kzalloc(RX_BUFFER_SIZE, GFP_KERNEL); buf = kzalloc(RX_BUFFER_SIZE, GFP_KERNEL);
if (!buf) if (!buf)
@ -552,7 +548,7 @@ static int kvaser_usb_wait_cmd(const struct kvaser_usb *dev, u8 id,
usb_rcvbulkpipe(dev->udev, usb_rcvbulkpipe(dev->udev,
dev->bulk_in->bEndpointAddress), dev->bulk_in->bEndpointAddress),
buf, RX_BUFFER_SIZE, &actual_len, buf, RX_BUFFER_SIZE, &actual_len,
USB_RECV_TIMEOUT); KVASER_USB_TIMEOUT);
if (err < 0) if (err < 0)
goto end; goto end;
@ -1450,7 +1446,7 @@ static int kvaser_usb_start_chip(struct kvaser_usb_net_priv *priv)
return err; return err;
if (!wait_for_completion_timeout(&priv->start_comp, if (!wait_for_completion_timeout(&priv->start_comp,
msecs_to_jiffies(START_TIMEOUT))) msecs_to_jiffies(KVASER_USB_TIMEOUT)))
return -ETIMEDOUT; return -ETIMEDOUT;
return 0; return 0;
@ -1540,7 +1536,7 @@ static int kvaser_usb_stop_chip(struct kvaser_usb_net_priv *priv)
return err; return err;
if (!wait_for_completion_timeout(&priv->stop_comp, if (!wait_for_completion_timeout(&priv->stop_comp,
msecs_to_jiffies(STOP_TIMEOUT))) msecs_to_jiffies(KVASER_USB_TIMEOUT)))
return -ETIMEDOUT; return -ETIMEDOUT;
return 0; return 0;