From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756717AbbIXPSZ (ORCPT ); Thu, 24 Sep 2015 11:18:25 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:65466 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753400AbbIXPSV (ORCPT ); Thu, 24 Sep 2015 11:18:21 -0400 X-AuditID: cbfec7f5-f794b6d000001495-ab-5604143b12c3 Message-id: <56041439.9050407@samsung.com> Date: Thu, 24 Sep 2015 17:18:17 +0200 From: Robert Baldyga User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-version: 1.0 To: balbi@ti.com Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, andrzej.p@samsung.com, b.zolnierkie@samsung.com Subject: Re: [PATCH 2/2] usb: gadget: f_loopfack: fix function params handling References: <1443106967-1972-1-git-send-email-r.baldyga@samsung.com> <1443106967-1972-3-git-send-email-r.baldyga@samsung.com> In-reply-to: <1443106967-1972-3-git-send-email-r.baldyga@samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xq7rWIixhBi9+slnMetnOYrFxxnpW i4P36y2aF69ns7i8aw6bxaJlrcwObB77565h9+jbsorR4/iN7UwenzfJBbBEcdmkpOZklqUW 6dslcGWc3PyPpeCuRMWLuetZGhifCXcxcnJICJhIXP3UywRhi0lcuLeerYuRi0NIYCmjxLb2 H6wQzjNGiZUn14FV8QpoSZy/sYsNxGYRUJW4/bodLM4moCOx5fsERhBbVCBCYvnqk4wQ9YIS PybfYwGxRQQEJNa/uMQOMpRZoItR4sq07WDNwgJ+Eod+HGLuYuQA2lYv0fJLFCTMKeAqcej/ YlaQMLOAnsT9i1ogYWYBeYnNa94yT2AUmIVkwyyEqllIqhYwMq9iFE0tTS4oTkrPNdIrTswt Ls1L10vOz93ECAnmrzsYlx6zOsQowMGoxMM7U4c5TIg1say4MvcQowQHs5IIL8d7oBBvSmJl VWpRfnxRaU5q8SFGaQ4WJXHembvehwgJpCeWpGanphakFsFkmTg4pRoYzaOs7TJTTey4Ons/ K0Zct9PJzPXgXheStzc/xdjUrTKW23b1yo+9Lu2L2E9tLnh59+zs0g8xDgXuJ2cpzk+1+7P5 442FfXfCy2MKqw9P3/zSl83ijOm3PffZfNcqfd/PUPxXk/eZr+pDzzd7D0Q8PGX1ZG/34SdF Dms5BNWZI5ZqNx46WzVNiaU4I9FQi7moOBEAD6RXNGICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Felipe, I see that Krzysztof Opasiak made the same change in patch https://lkml.org/lkml/2015/9/22/578, so please just ignore my patch. My first patch is still needed - I will resend it with CC: stable. Thanks, Robert Baldyga On 09/24/2015 05:02 PM, Robert Baldyga wrote: > Move function parameters to struct f_loopback to make them per instance > instead of having them as global variables. Since we can have multiple > instances of USB function we also want to have separate set of parameters > for each instance. > > Signed-off-by: Robert Baldyga > --- > drivers/usb/gadget/function/f_loopback.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c > index 300e601..8d2dac8 100644 > --- a/drivers/usb/gadget/function/f_loopback.c > +++ b/drivers/usb/gadget/function/f_loopback.c > @@ -34,6 +34,9 @@ struct f_loopback { > > struct usb_ep *in_ep; > struct usb_ep *out_ep; > + > + unsigned qlen; > + unsigned buflen; > }; > > static inline struct f_loopback *func_to_loop(struct usb_function *f) > @@ -41,9 +44,6 @@ static inline struct f_loopback *func_to_loop(struct usb_function *f) > return container_of(f, struct f_loopback, function); > } > > -static unsigned qlen; > -static unsigned buflen; > - > /*-------------------------------------------------------------------------*/ > > static struct usb_interface_descriptor loopback_intf = { > @@ -251,7 +251,7 @@ static void loopback_complete(struct usb_ep *ep, struct usb_request *req) > } > > /* queue the buffer for some later OUT packet */ > - req->length = buflen; > + req->length = loop->buflen; > status = usb_ep_queue(ep, req, GFP_ATOMIC); > if (status == 0) > return; > @@ -288,7 +288,9 @@ static void disable_loopback(struct f_loopback *loop) > > static inline struct usb_request *lb_alloc_ep_req(struct usb_ep *ep, int len) > { > - return alloc_ep_req(ep, len, buflen); > + struct f_loopback *loop = ep->driver_data; > + > + return alloc_ep_req(ep, len, loop->buflen); > } > > static int enable_endpoint(struct usb_composite_dev *cdev, struct f_loopback *loop, > @@ -315,7 +317,7 @@ static int enable_endpoint(struct usb_composite_dev *cdev, struct f_loopback *lo > * we buffer at most 'qlen' transfers; fewer if any need more > * than 'buflen' bytes each. > */ > - for (i = 0; i < qlen && result == 0; i++) { > + for (i = 0; i < loop->qlen && result == 0; i++) { > req = lb_alloc_ep_req(ep, 0); > if (!req) > goto fail1; > @@ -388,10 +390,10 @@ static struct usb_function *loopback_alloc(struct usb_function_instance *fi) > lb_opts->refcnt++; > mutex_unlock(&lb_opts->lock); > > - buflen = lb_opts->bulk_buflen; > - qlen = lb_opts->qlen; > - if (!qlen) > - qlen = 32; > + loop->buflen = lb_opts->bulk_buflen; > + loop->qlen = lb_opts->qlen; > + if (!loop->qlen) > + loop->qlen = 32; > > loop->function.name = "loopback"; > loop->function.bind = loopback_bind; >