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: Refactor kvaser_usb_get_endpoints() 

Replace parameters with struct kvaser_usb pointer. Rename the function
from kvaser_usb_get_endpoints() to kvaser_usb_setup_endpoints().

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:23 +02:00 committed by Marc Kleine-Budde
parent 0e30619fd6
commit 99ce1bc174
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1914,27 +1914,25 @@ static int kvaser_usb_init_one(struct usb_interface *intf,
return 0; return 0;
} }
static int kvaser_usb_get_endpoints(const struct usb_interface *intf, static int kvaser_usb_setup_endpoints(struct kvaser_usb *dev)
struct usb_endpoint_descriptor **in,
struct usb_endpoint_descriptor **out)
{ {
const struct usb_host_interface *iface_desc; const struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
int i; int i;
iface_desc = &intf->altsetting[0]; iface_desc = &dev->intf->altsetting[0];
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
endpoint = &iface_desc->endpoint[i].desc; endpoint = &iface_desc->endpoint[i].desc;
if (!*in && usb_endpoint_is_bulk_in(endpoint)) if (!dev->bulk_in && usb_endpoint_is_bulk_in(endpoint))
*in = endpoint; dev->bulk_in = endpoint;
if (!*out && usb_endpoint_is_bulk_out(endpoint)) if (!dev->bulk_out && usb_endpoint_is_bulk_out(endpoint))
*out = endpoint; dev->bulk_out = endpoint;
/* use first bulk endpoint for in and out */ /* use first bulk endpoint for in and out */
if (*in && *out) if (dev->bulk_in && dev->bulk_out)
return 0; return 0;
} }
@ -1965,7 +1963,7 @@ static int kvaser_usb_probe(struct usb_interface *intf,
dev->intf = intf; dev->intf = intf;
err = kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out); err = kvaser_usb_setup_endpoints(dev);
if (err) { if (err) {
dev_err(&intf->dev, "Cannot get usb endpoint(s)"); dev_err(&intf->dev, "Cannot get usb endpoint(s)");
return err; return err;