can: kvaser_usb: refactor endpoint lookup
PATCH 1/1 can: kvaser_usb: refactor endpoint lookup
The check for endpoint addresses in mhydra is redundant as the correct in and out endpoints will always be first.
Move kvaser_usb_leaf_setup_endpoints to kvaser_usb_core and use with both mhydra and leaf.
Remove dev_setup_endpoint from kvaser_usb_dev_ops.
Signed-off-by Anton Olsson <[email protected]>
Reviewed-by Jimmy Assarsson <[email protected]>
--- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 -- .../net/can/usb/kvaser_usb/kvaser_usb_core.c | 19 +++++++++++- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 30 ------------------- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 17 ----------- 4 files changed, 18 insertions(+), 50 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb.h +0 -2
@@ -161,7 +161,6 @@ struct kvaser_usb_net_priv {* @dev_get_data_busparams: readback data busparams * @dev_get_berr_counter: used for can.do_get_berr_counter * -* @dev_setup_endpoints: setup USB in and out endpoints * @dev_init_card: initialize card * @dev_init_channel: initialize channel * @dev_remove_channel: uninitialize channel
@@ -189,7 +188,6 @@ struct kvaser_usb_dev_ops {int (*dev_get_data_busparams)(struct kvaser_usb_net_priv *priv);int (*dev_get_berr_counter)(const struct net_device *netdev,struct can_berr_counter *bec); -int (*dev_setup_endpoints)(struct kvaser_usb *dev);int (*dev_init_card)(struct kvaser_usb *dev);int (*dev_init_channel)(struct kvaser_usb_net_priv *priv);void (*dev_remove_channel)(struct kvaser_usb_net_priv *priv);
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +18 -1
@@ -926,6 +926,23 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)return err; } +static int kvaser_usb_setup_endpoints (struct kvaser_usb *dev) +{ +struct usb_host_interface *iface_desc; +int ret; + + iface_desc = dev->intf->cur_altsetting; + +/* use first bulk endpoint for in and out */ + ret =usb_find_common_endpoints (iface_desc, &dev->bulk_in, + &dev->bulk_out,NULL ,NULL ); + +if (ret) +return -ENODEV ; + +return 0 ; +} +static int kvaser_usb_probe (struct usb_interface *intf,const struct usb_device_id *id) {
@@ -949,7 +966,7 @@ static int kvaser_usb_probe(struct usb_interface *intf, dev->driver_info = driver_info; ops = driver_info->ops; - err = ops->dev_setup_endpoints (dev); + err =kvaser_usb_setup_endpoints (dev);if (err) {dev_err_probe (&intf->dev, err,"Cannot get usb endpoint(s)" ); goto free_devlink;
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +0 -30
@@ -37,9 +37,6 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan;static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt; -#define KVASER_USB_HYDRA_BULK_EP_IN_ADDR 0x82 -#define KVASER_USB_HYDRA_BULK_EP_OUT_ADDR 0x02 -#define KVASER_USB_HYDRA_MAX_TRANSID 0xff#define KVASER_USB_HYDRA_MIN_TRANSID 0x01
@@ -1732,32 +1729,6 @@ static int kvaser_usb_hydra_get_berr_counter(const struct net_device *netdev,return 0 ; } -static int kvaser_usb_hydra_setup_endpoints (struct kvaser_usb *dev) -{ -const struct usb_host_interface *iface_desc; -struct usb_endpoint_descriptor *ep; -int i; - - iface_desc = dev->intf->cur_altsetting; - -for (i =0 ; i < iface_desc->desc.bNumEndpoints; ++i) { - ep = &iface_desc->endpoint[i].desc; - -if (!dev->bulk_in &&usb_endpoint_is_bulk_in (ep) && - ep->bEndpointAddress ==KVASER_USB_HYDRA_BULK_EP_IN_ADDR ) - dev->bulk_in = ep; - -if (!dev->bulk_out &&usb_endpoint_is_bulk_out (ep) && - ep->bEndpointAddress ==KVASER_USB_HYDRA_BULK_EP_OUT_ADDR ) - dev->bulk_out = ep; - -if (dev->bulk_in && dev->bulk_out) -return 0 ; - } - -return -ENODEV ; -} -static int kvaser_usb_hydra_init_card (struct kvaser_usb *dev) {int err;
@@ -2202,7 +2173,6 @@ const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = { .dev_set_data_bittiming = kvaser_usb_hydra_set_data_bittiming, .dev_get_data_busparams = kvaser_usb_hydra_get_data_busparams, .dev_get_berr_counter = kvaser_usb_hydra_get_berr_counter, - .dev_setup_endpoints = kvaser_usb_hydra_setup_endpoints, .dev_init_card = kvaser_usb_hydra_init_card, .dev_init_channel = kvaser_usb_hydra_init_channel, .dev_get_software_info = kvaser_usb_hydra_get_software_info,
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +0 -17
@@ -1955,22 +1955,6 @@ static int kvaser_usb_leaf_get_berr_counter(const struct net_device *netdev,return 0 ; } -static int kvaser_usb_leaf_setup_endpoints (struct kvaser_usb *dev) -{ -struct usb_host_interface *iface_desc; -int ret; - - iface_desc = dev->intf->cur_altsetting; - -/* use first bulk endpoint for in and out */ - ret =usb_find_common_endpoints (iface_desc, &dev->bulk_in, &dev->bulk_out, -NULL ,NULL ); -if (ret) -return -ENODEV ; - -return 0 ; -} -const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = { .dev_set_mode = kvaser_usb_leaf_set_mode, .dev_set_bittiming = kvaser_usb_leaf_set_bittiming,
@@ -1978,7 +1962,6 @@ const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = { .dev_set_data_bittiming = NULL, .dev_get_data_busparams = NULL, .dev_get_berr_counter = kvaser_usb_leaf_get_berr_counter, - .dev_setup_endpoints = kvaser_usb_leaf_setup_endpoints, .dev_init_card = kvaser_usb_leaf_init_card, .dev_init_channel = kvaser_usb_leaf_init_channel, .dev_remove_channel = kvaser_usb_leaf_remove_channel,
Signature · 1 line
2.43.0