Skip to content

Commit

Permalink
usb: gadget: u_ether: use better list accessors
Browse files Browse the repository at this point in the history
We have helpers for some of these, let's rely on them instead of open
coding what they do in u_ether.c

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  • Loading branch information
Felipe Balbi committed Apr 11, 2017
1 parent aad7c25 commit fea14e6
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/usb/gadget/function/u_ether.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,12 @@ static int alloc_requests(struct eth_dev *dev, struct gether *link, unsigned n)
static void rx_fill(struct eth_dev *dev, gfp_t gfp_flags)
{
struct usb_request *req;
struct usb_request *tmp;
unsigned long flags;

/* fill unused rxq slots with some skb */
spin_lock_irqsave(&dev->req_lock, flags);
while (!list_empty(&dev->rx_reqs)) {
req = container_of(dev->rx_reqs.next,
struct usb_request, list);
list_for_each_entry_safe(req, tmp, &dev->rx_reqs, list) {
list_del_init(&req->list);
spin_unlock_irqrestore(&dev->req_lock, flags);

Expand Down Expand Up @@ -527,7 +526,7 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
return NETDEV_TX_BUSY;
}

req = container_of(dev->tx_reqs.next, struct usb_request, list);
req = list_first_entry(&dev->tx_reqs, struct usb_request, list);
list_del(&req->list);

/* temporarily stop TX queue when the freelist empties */
Expand Down Expand Up @@ -1122,6 +1121,7 @@ void gether_disconnect(struct gether *link)
{
struct eth_dev *dev = link->ioport;
struct usb_request *req;
struct usb_request *tmp;

WARN_ON(!dev);
if (!dev)
Expand All @@ -1138,9 +1138,7 @@ void gether_disconnect(struct gether *link)
*/
usb_ep_disable(link->in_ep);
spin_lock(&dev->req_lock);
while (!list_empty(&dev->tx_reqs)) {
req = container_of(dev->tx_reqs.next,
struct usb_request, list);
list_for_each_entry_safe(req, tmp, &dev->tx_reqs, list) {
list_del(&req->list);

spin_unlock(&dev->req_lock);
Expand All @@ -1152,9 +1150,7 @@ void gether_disconnect(struct gether *link)

usb_ep_disable(link->out_ep);
spin_lock(&dev->req_lock);
while (!list_empty(&dev->rx_reqs)) {
req = container_of(dev->rx_reqs.next,
struct usb_request, list);
list_for_each_entry_safe(req, tmp, &dev->rx_reqs, list) {
list_del(&req->list);

spin_unlock(&dev->req_lock);
Expand Down

0 comments on commit fea14e6

Please sign in to comment.