From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758339AbcG0UC2 (ORCPT ); Wed, 27 Jul 2016 16:02:28 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36881 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757475AbcG0UCZ convert rfc822-to-8bit (ORCPT ); Wed, 27 Jul 2016 16:02:25 -0400 From: Michal Nazarewicz To: "Felipe F. Tonello" , linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Felipe Balbi , Baolin Wang , Andrzej Pietrasiewicz Subject: Re: [PATCH 7/9] usb: gadget: remove useless parameter in alloc_ep_req() In-Reply-To: <20160726191200.18943-8-eu@felipetonello.com> Organization: http://mina86.com/ References: <20160726191200.18943-1-eu@felipetonello.com> <20160726191200.18943-8-eu@felipetonello.com> User-Agent: Notmuch/0.19+53~g2e63a09 (http://notmuchmail.org) Emacs/25.1.50.1 (x86_64-unknown-linux-gnu) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACP0lEQVQ4T23Sv2vbQBQHcBk1xE6WyALX107VUEgmn6+ouUwpEQQ6uRjttkWP4CkBg2M0BQLBdPFZYPsyFYo7qEtKDQ7on+t7+nF2Ux8ahD587717OmNYrOvycHsZ+o2r051wHTHysAvGb8ygvgu4QWT0sCmkgZCIEnlV2X8BtyraazFGDuxhmKSQJMlwHQ7v5MHSNxmz78rfElwAa3ieVD9e+hBhjaPDDG6NgFo2f4wBMNIo5YmRtF0RyDgFjJjlMIWbnuM4x9MMfABGTlN4qgIQB4A1DEyA1BHWtfeWNUMwiVJKoqh97KrkOO+qzgluVYLvFCUKAX73nONeBr7BGMdM6Sg0kuep03VywLaIzRiVr+GAzKlpQIsAFnWAG2e6DT5WmWDiudZMIc6hYrMOmeMQK9WX0B+/RfjzL9DI7Y9/Iayn29Ci0r2i4f9gMimMSZLCDMalgQGU5hnUtqAN0OGvEmO1Wnl0C0wWSCEHnuHBqmygxdxA8oWXwbipoc1EoNR9DqOpBpOJrnr0criQab9ZT4LL+wI+K7GBQH30CrhUruilgP9DRTrhVWZCiAyILP+wiuLeCKGTD6r/nc8LOJcAwR6IBTUs+7CASw3QFZ0MdA2PI3zNziH4ZKVhXCRMBjeZ1DWMekKwDCASwExy+NQ86TaykaDAFHO4aP48y4fIcDM5yOG8GcTLbOyp8A8azjJI93JFd1EA6yN8sSxMQJWoABqniRZVykYgRXErzrdqExAoUrRb0xfRp8p2A/4XmfilTtkDZ4cAAAAASUVORK5CYII= X-Face: -TR8(rDTHy/(xl?SfWd1|3:TTgDIatE^t'vop%*gVg[kn$t{EpK(P"VQ=~T2#ysNmJKN$"yTRLB4YQs$4{[.]Fc1)*O]3+XO^oXM>Q#b^ix,O)Zbn)q[y06$`e3?C)`CwR9y5riE=fv^X@x$y?D:XO6L&x4f-}}I4=VRNwiA^t1-ZrVK^07.Pi/57c_du'& X-PGP: 50751FF4 X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 X-Hashcash: 1:20:160727:linux-kernel@vger.kernel.org::avaBwRTR9ZPG3qud:00000000000000000000000000000000026mS X-Hashcash: 1:20:160727:baolin.wang@linaro.org::Lrw+ih7W1oQQIqG3:0000000000000000000000000000000000000001cUm X-Hashcash: 1:20:160727:eu@felipetonello.com::XhVI+cqQ9FafoLte:000000000000000000000000000000000000000001g8E X-Hashcash: 1:20:160727:andrzej.p@samsung.com::NNbOvb57OAIbj1j/:00000000000000000000000000000000000000001jcv X-Hashcash: 1:20:160727:balbi@kernel.org::1EKw6jCcSL6fQuWH:03NQ0 X-Hashcash: 1:20:160727:linux-usb@vger.kernel.org::QSYexeSXEafWtJWp:0000000000000000000000000000000000004mKl Date: Wed, 27 Jul 2016 22:02:22 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 26 2016, Felipe F. Tonello wrote: > This parameter was not really necessary and gadget drivers would almost always I personally like when commit messages can be read without subject, so perhaps: The default_length parameter of alloc_ep_req was not … But that’s just me. > create an inline function to pass the same value to len and default_len. > > So this patch also removes duplicate code from few drivers. > > Signed-off-by: Felipe F. Tonello Acked-by: Michal Nazarewicz > --- > drivers/usb/gadget/function/f_hid.c | 10 ++-------- > drivers/usb/gadget/function/f_loopback.c | 9 +-------- > drivers/usb/gadget/function/f_midi.c | 10 ++-------- > drivers/usb/gadget/function/f_sourcesink.c | 11 ++--------- > drivers/usb/gadget/u_f.c | 7 +++---- > drivers/usb/gadget/u_f.h | 2 +- > 6 files changed, 11 insertions(+), 38 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c > index 51980c50546d..e82a7468252e 100644 > --- a/drivers/usb/gadget/function/f_hid.c > +++ b/drivers/usb/gadget/function/f_hid.c > @@ -362,12 +362,6 @@ static int f_hidg_open(struct inode *inode, struct file *fd) > /*-------------------------------------------------------------------------*/ > /* usb_function */ > > -static inline struct usb_request *hidg_alloc_ep_req(struct usb_ep *ep, > - unsigned length) > -{ > - return alloc_ep_req(ep, length, length); > -} > - > static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) > { > struct f_hidg *hidg = (struct f_hidg *) req->context; > @@ -549,8 +543,8 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) > */ > for (i = 0; i < hidg->qlen && status == 0; i++) { > struct usb_request *req = > - hidg_alloc_ep_req(hidg->out_ep, > - hidg->report_length); > + alloc_ep_req(hidg->out_ep, > + hidg->report_length); > if (req) { > req->complete = hidg_set_report_complete; > req->context = hidg; > diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c > index 3a9f8f9c77bd..701ee0f11c33 100644 > --- a/drivers/usb/gadget/function/f_loopback.c > +++ b/drivers/usb/gadget/function/f_loopback.c > @@ -306,13 +306,6 @@ static void disable_loopback(struct f_loopback *loop) > VDBG(cdev, "%s disabled\n", loop->function.name); > } > > -static inline struct usb_request *lb_alloc_ep_req(struct usb_ep *ep, int len) > -{ > - struct f_loopback *loop = ep->driver_data; > - > - return alloc_ep_req(ep, len, loop->buflen); > -} > - > static int alloc_requests(struct usb_composite_dev *cdev, > struct f_loopback *loop) > { > @@ -333,7 +326,7 @@ static int alloc_requests(struct usb_composite_dev *cdev, > if (!in_req) > goto fail; > > - out_req = lb_alloc_ep_req(loop->out_ep, 0); > + out_req = alloc_ep_req(loop->out_ep, loop->buflen); > if (!out_req) > goto fail_in; > > diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c > index 3a47596afcab..abf26364b46f 100644 > --- a/drivers/usb/gadget/function/f_midi.c > +++ b/drivers/usb/gadget/function/f_midi.c > @@ -208,12 +208,6 @@ static struct usb_gadget_strings *midi_strings[] = { > NULL, > }; > > -static inline struct usb_request *midi_alloc_ep_req(struct usb_ep *ep, > - unsigned length) > -{ > - return alloc_ep_req(ep, length, length); > -} > - > static const uint8_t f_midi_cin_length[] = { > 0, 0, 2, 3, 3, 1, 2, 3, 3, 3, 3, 3, 2, 2, 3, 1 > }; > @@ -365,7 +359,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) > /* pre-allocate write usb requests to use on f_midi_transmit. */ > while (kfifo_avail(&midi->in_req_fifo)) { > struct usb_request *req = > - midi_alloc_ep_req(midi->in_ep, midi->buflen); > + alloc_ep_req(midi->in_ep, midi->buflen); > > if (req == NULL) > return -ENOMEM; > @@ -379,7 +373,7 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) > /* allocate a bunch of read buffers and queue them all at once. */ > for (i = 0; i < midi->qlen && err == 0; i++) { > struct usb_request *req = > - midi_alloc_ep_req(midi->out_ep, midi->buflen); > + alloc_ep_req(midi->out_ep, midi->buflen); > > if (req == NULL) > return -ENOMEM; > diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c > index df0189ddfdd5..517d78d6da78 100644 > --- a/drivers/usb/gadget/function/f_sourcesink.c > +++ b/drivers/usb/gadget/function/f_sourcesink.c > @@ -291,13 +291,6 @@ static struct usb_gadget_strings *sourcesink_strings[] = { > > /*-------------------------------------------------------------------------*/ > > -static inline struct usb_request *ss_alloc_ep_req(struct usb_ep *ep, int len) > -{ > - struct f_sourcesink *ss = ep->driver_data; > - > - return alloc_ep_req(ep, len, ss->buflen); > -} > - > static void disable_ep(struct usb_composite_dev *cdev, struct usb_ep *ep) > { > int value; > @@ -606,11 +599,11 @@ static int source_sink_start_ep(struct f_sourcesink *ss, bool is_in, > } else { > ep = is_in ? ss->in_ep : ss->out_ep; > qlen = ss->bulk_qlen; > - size = 0; > + size = ss->buflen; > } > > for (i = 0; i < qlen; i++) { > - req = ss_alloc_ep_req(ep, size); > + req = alloc_ep_req(ep, size); > if (!req) > return -ENOMEM; > > diff --git a/drivers/usb/gadget/u_f.c b/drivers/usb/gadget/u_f.c > index d1933b0b76c3..dfc40f7155ac 100644 > --- a/drivers/usb/gadget/u_f.c > +++ b/drivers/usb/gadget/u_f.c > @@ -14,15 +14,14 @@ > #include "u_f.h" > #include > > -struct usb_request *alloc_ep_req(struct usb_ep *ep, int len, int default_len) > +struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len) > { > struct usb_request *req; > > req = usb_ep_alloc_request(ep, GFP_ATOMIC); > if (req) { > - req->length = len ?: default_len; > - if (usb_endpoint_dir_out(ep->desc)) > - req->length = usb_ep_align(ep, req->length); > + req->length = usb_endpoint_dir_out(ep->desc) ? > + usb_ep_align(ep, req->length) : len; > req->buf = kmalloc(req->length, GFP_ATOMIC); > if (!req->buf) { > usb_ep_free_request(ep, req); > diff --git a/drivers/usb/gadget/u_f.h b/drivers/usb/gadget/u_f.h > index 4247cc098a89..2852c9d7a85d 100644 > --- a/drivers/usb/gadget/u_f.h > +++ b/drivers/usb/gadget/u_f.h > @@ -48,7 +48,7 @@ struct usb_ep; > struct usb_request; > > /* Requests allocated via alloc_ep_req() must be freed by free_ep_req(). */ > -struct usb_request *alloc_ep_req(struct usb_ep *ep, int len, int default_len); > +struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len); > static inline void free_ep_req(struct usb_ep *ep, struct usb_request *req) > { > kfree(req->buf); > -- > 2.9.0 > -- Best regards ミハウ “𝓶𝓲𝓷𝓪86” ナザレヴイツ «If at first you don’t succeed, give up skydiving»