From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933592AbcBCMm2 (ORCPT ); Wed, 3 Feb 2016 07:42:28 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:34541 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933414AbcBCMmU (ORCPT ); Wed, 3 Feb 2016 07:42:20 -0500 X-AuditID: cbfee61a-f79266d000003652-57-56b1f5a2fa66 From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Baldyga Subject: [PATCH v4 39/43] usb: gadget: u_ether: remove usb_ep_enable()/usb_ep_disable() Date: Wed, 03 Feb 2016 13:39:47 +0100 Message-id: <1454503191-11796-40-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> References: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCLMWRmVeSWpSXmKPExsVy+t9jQd1FXzeGGTw/xm0x62U7i8XGGetZ LQ7er7doXryezeLyrjlsFouWtTJbrD1yl93iweGd7A4cHvvnrmH36NuyitHj+I3tTB6fN8kF sERx2aSk5mSWpRbp2yVwZax7eYu54JFgResXjwbGS3xdjJwcEgImEutO32SGsMUkLtxbz9bF yMUhJDCLUWL95HPMEM5PRomN25exg1SxCehIbPk+gRHEFhEQkFj/4hI7SBGzwDlGiYd32sAS wgKRErse9gMlODhYBFQl7lxOAwnzCrhJLHp9lAlim5zEyWOTWUFKOIHiD485gISFBFwldrV+ Z5zAyLuAkWEVo0RqQXJBcVJ6rmFearlecWJucWleul5yfu4mRnBYPZPawXhwl/shRgEORiUe XoYfG8KEWBPLiitzDzFKcDArifAafd4YJsSbklhZlVqUH19UmpNafIhRmoNFSZz38f91YUIC 6YklqdmpqQWpRTBZJg5OqQbGOS/zBVf+df126OKC3Rr7Jh481Rtzou2BxHSZT6zWj4veB381 ZDuSLCvbu279do5azmMn31x8tONQScGq7fZnv82cfOnGlyjtgnDNWV/MlTr+iRj+Py2vwvbf 4oWaNUP1zUtH/lZveaAX6JS1OmqT4MlXHBLlLv9bl5recp2/bv5jczYvnVlO2kosxRmJhlrM RcWJAPO05KUnAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we have automatic endpoint state handling it's no longer needed. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/function/u_ether.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 637809e..9d23842 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -1041,20 +1041,7 @@ struct net_device *gether_connect(struct gether *link) return ERR_PTR(-EINVAL); link->in_ep->driver_data = dev; - result = usb_ep_enable(link->in_ep); - if (result != 0) { - DBG(dev, "enable %s --> %d\n", - link->in_ep->name, result); - goto fail0; - } - link->out_ep->driver_data = dev; - result = usb_ep_enable(link->out_ep); - if (result != 0) { - DBG(dev, "enable %s --> %d\n", - link->out_ep->name, result); - goto fail1; - } if (result == 0) result = alloc_requests(dev, link, qlen(dev->gadget, @@ -1082,14 +1069,8 @@ struct net_device *gether_connect(struct gether *link) netif_carrier_on(dev->net); if (netif_running(dev->net)) eth_start(dev, GFP_ATOMIC); - - /* on error, disable any endpoints */ - } else { - (void) usb_ep_disable(link->out_ep); -fail1: - (void) usb_ep_disable(link->in_ep); } -fail0: + /* caller is responsible for cleanup on error */ if (result < 0) return ERR_PTR(result); @@ -1123,11 +1104,7 @@ void gether_disconnect(struct gether *link) netif_stop_queue(dev->net); netif_carrier_off(dev->net); - /* disable endpoints, forcing (synchronous) completion - * of all pending i/o. then free the request objects - * and forget about the endpoints. - */ - usb_ep_disable(link->in_ep); + /* free the request objects and forget about the endpoints. */ spin_lock(&dev->req_lock); while (!list_empty(&dev->tx_reqs)) { req = container_of(dev->tx_reqs.next, @@ -1141,7 +1118,6 @@ void gether_disconnect(struct gether *link) spin_unlock(&dev->req_lock); link->in_ep->desc = NULL; - usb_ep_disable(link->out_ep); spin_lock(&dev->req_lock); while (!list_empty(&dev->rx_reqs)) { req = container_of(dev->rx_reqs.next, -- 1.9.1