Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348AbbKCMyw (ORCPT ); Tue, 3 Nov 2015 07:54:52 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:55348 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753983AbbKCMyo (ORCPT ); Tue, 3 Nov 2015 07:54:44 -0500 X-AuditID: cbfee61a-f79a06d000005c6f-91-5638ae80e2ca 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 03/23] usb: gadget: f_sourcesink: free requests in sourcesink_disable() Date: Tue, 03 Nov 2015 13:53:42 +0100 Message-id: <1446555242-3733-4-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1446555242-3733-1-git-send-email-r.baldyga@samsung.com> References: <1446555242-3733-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMLMWRmVeSWpSXmKPExsVy+t9jQd3GdRZhBr8vslnMetnOYrFxxnpW i4P36y2aF69ns7i8aw6bxaJlrcwWa4/cZbd4cHgnuwOHx/65a9g9+rasYvQ4fmM7k8fnTXIB LFFcNimpOZllqUX6dglcGReP3WcreCRaserTDpYGxt2CXYycHBICJhL969awQdhiEhfurQey uTiEBGYxSlyZtZkJwvnJKPG7u4kVpIpNQEdiy/cJjCC2iICAxPoXl9hBipgFzjFKPLzTBpTg 4BAWiJRY99UdxGQRUJX4vVsdpJxXwEXizsVWRohlchInj01mBSnhFHCVuPROGcQUAio5vp1n AiPvAkaGVYwSqQXJBcVJ6bmGeanlesWJucWleel6yfm5mxjBQfVMagfjwV3uhxgFOBiVeHgX LDEPE2JNLCuuzD3EKMHBrCTCu3uuRZgQb0piZVVqUX58UWlOavEhRmkOFiVxXn1PozAhgfTE ktTs1NSC1CKYLBMHp1QDo4HK1ZnrOMKlzsS6VkZE8+zjvX5fOOVvTNn9pmtWSpf3BM9Iy7hn ZOZuVcf44P3yC0U3OS6sNPx69rWq7Zsf/W0ay3LWr2k2cNUyVZ/z6PT3O3cFnc4clD7TM8Gz fVN0rdbsJen73r8t7pgl+M/g7eSAkuRdcR+WzWdT6b8S3fkjLvPHM7tltUosxRmJhlrMRcWJ AKu9xksmAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2936 Lines: 100 USB requests in SourceSink function are allocated in sourcesink_get_alt() function, so we prefer to free them rather in sourcesink_disable() than in source_sink_complete() when request is completed with error. It provides better symetry in resource management and improves code readability. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/function/f_sourcesink.c | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c index a8b68c6..d8f5f56 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -22,6 +22,8 @@ #include "g_zero.h" #include "u_f.h" +#define REQ_CNT 8 + /* * SOURCE/SINK FUNCTION ... a primary testing vehicle for USB peripheral * controller drivers. @@ -51,6 +53,11 @@ struct f_sourcesink { struct usb_ep *iso_out_ep; int cur_alt; + struct usb_request *in_req; + struct usb_request *out_req; + struct usb_request *iso_in_req[REQ_CNT]; + struct usb_request *iso_out_req[REQ_CNT]; + unsigned pattern; unsigned isoc_interval; unsigned isoc_maxpacket; @@ -561,7 +568,6 @@ static void source_sink_complete(struct usb_ep *ep, struct usb_request *req) req->actual, req->length); if (ep == ss->out_ep) check_read_data(ss, req); - free_ep_req(ep, req); return; case -EOVERFLOW: /* buffer overrun on read means that @@ -613,7 +619,7 @@ static int source_sink_start_ep(struct f_sourcesink *ss, bool is_in, ep = is_in ? ss->in_ep : ss->out_ep; } - for (i = 0; i < 8; i++) { + for (i = 0; i < REQ_CNT; i++) { req = ss_alloc_ep_req(ep, size); if (!req) return -ENOMEM; @@ -635,8 +641,18 @@ static int source_sink_start_ep(struct f_sourcesink *ss, bool is_in, free_ep_req(ep, req); } - if (!is_iso) + if (is_iso) { + if (is_in) + ss->iso_in_req[i] = req; + else + ss->iso_out_req[i] = req; + } else { + if (is_in) + ss->in_req = req; + else + ss->out_req = req; break; + } } return status; @@ -764,8 +780,19 @@ static int sourcesink_get_alt(struct usb_function *f, unsigned intf) static void sourcesink_disable(struct usb_function *f) { struct f_sourcesink *ss = func_to_ss(f); + int i; disable_source_sink(ss); + + free_ep_req(ss->in_ep, ss->in_req); + free_ep_req(ss->out_ep, ss->out_req); + + if (ss->iso_in_ep) { + for (i = 0; i < REQ_CNT; i++) { + free_ep_req(ss->iso_in_ep, ss->iso_in_req[i]); + free_ep_req(ss->iso_out_ep, ss->iso_out_req[i]); + } + } } /*-------------------------------------------------------------------------*/ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/