Skip to content

Commit

Permalink
can: etas_es58x: remove useless calls to usb_fill_bulk_urb()
Browse files Browse the repository at this point in the history
Aside of urb->transfer_buffer_length and urb->context which might
change in the TX path, all the other URB parameters remains constant
during runtime. So, there is no reasons to call usb_fill_bulk_urb()
each time before submitting an URB.

Make sure to initialize all the fields of the URB at allocation
time. For the TX branch, replace the call usb_fill_bulk_urb() by an
assignment of urb->context. urb->urb->transfer_buffer_length is
already set by the caller functions, no need to set it again. For the
RX branch, because all parameters are unchanged, simply remove the
call to usb_fill_bulk_urb().

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20220729080902.25839-1-mailhol.vincent@wanadoo.fr
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Vincent Mailhol authored and Marc Kleine-Budde committed Jul 29, 2022
1 parent 12a18d7 commit e0f3907
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/net/can/usb/etas_es58x/es58x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1460,10 +1460,6 @@ static void es58x_read_bulk_callback(struct urb *urb)
}

resubmit_urb:
usb_fill_bulk_urb(urb, es58x_dev->udev, es58x_dev->rx_pipe,
urb->transfer_buffer, urb->transfer_buffer_length,
es58x_read_bulk_callback, es58x_dev);

ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret == -ENODEV) {
for (i = 0; i < es58x_dev->num_can_ch; i++)
Expand Down Expand Up @@ -1597,7 +1593,8 @@ static struct urb *es58x_get_tx_urb(struct es58x_device *es58x_dev)
return NULL;

usb_fill_bulk_urb(urb, es58x_dev->udev, es58x_dev->tx_pipe,
buf, tx_buf_len, NULL, NULL);
buf, tx_buf_len, es58x_write_bulk_callback,
NULL);
return urb;
}

Expand Down Expand Up @@ -1630,9 +1627,7 @@ static int es58x_submit_urb(struct es58x_device *es58x_dev, struct urb *urb,
int ret;

es58x_set_crc(urb->transfer_buffer, urb->transfer_buffer_length);
usb_fill_bulk_urb(urb, es58x_dev->udev, es58x_dev->tx_pipe,
urb->transfer_buffer, urb->transfer_buffer_length,
es58x_write_bulk_callback, netdev);
urb->context = netdev;
usb_anchor_urb(urb, &es58x_dev->tx_urbs_busy);
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret) {
Expand Down

0 comments on commit e0f3907

Please sign in to comment.