From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762216AbdJQN0O (ORCPT ); Tue, 17 Oct 2017 09:26:14 -0400 Received: from mail-qt0-f172.google.com ([209.85.216.172]:49057 "EHLO mail-qt0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762186AbdJQN0L (ORCPT ); Tue, 17 Oct 2017 09:26:11 -0400 X-Google-Smtp-Source: AOwi7QAE4pkat6VDPaTbyuN59qyEoiJ6KleWcYREJBxzb02oviVxJoGVo3PmlF73JHg7GWTT+US0cA== From: Michal Nazarewicz To: Kees Cook , Greg Kroah-Hartman Cc: Felipe Balbi , Raviteja Garimella , "Gustavo A. R. Silva" , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] usb/gadget/snps_udc_core: Convert timers to use timer_setup() In-Reply-To: <20171016233933.GA101795@beast> Organization: http://mina86.com/ References: <20171016233933.GA101795@beast> 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'& OpenPGP: id=AC1F5F5CD41888F8CC8458582060401250751FF4; url=http://mina86.com/mina86.pub X-Hashcash: 1:20:171017:gregkh@linuxfoundation.org::vQWdYIRAZV7A+KUJ:0000000000000000000000000000000000018mP X-Hashcash: 1:20:171017:linux-kernel@vger.kernel.org::QqI/19adUZQrpKbL:0000000000000000000000000000000000/p6 X-Hashcash: 1:20:171017:balbi@kernel.org::99E4GXxScCcyS8I0:00TIB X-Hashcash: 1:20:171017:garsilva@embeddedor.com::8d3fb6bv8Zoticfd:000000000000000000000000000000000000002yix X-Hashcash: 1:20:171017:keescook@chromium.org::DoQLvZTYetaSjkQT:00000000000000000000000000000000000000005KRi X-Hashcash: 1:20:171017:linux-usb@vger.kernel.org::hnRCHSG6K8Tfc+C/:0000000000000000000000000000000000006h48 X-Hashcash: 1:20:171017:raviteja.garimella@broadcom.com::H+Y8fFgd6qTBIzyD:000000000000000000000000000000DfPM Date: Tue, 17 Oct 2017 15:26:05 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v9HDQIOw020558 On Mon, Oct 16 2017, Kees Cook wrote: > In preparation for unconditionally passing the struct timer_list pointer to > all timer callbacks, switch to using the new timer_setup() and from_timer() > to pass the timer pointer explicitly. > > If the probe fails, udc_remove() will not be called, so there is no > reason to make del_timer_sync() calls conditional. As a result, use of > the .data field can be dropped, in support of making removing this field > entirely from struct timer_list. > > Cc: Felipe Balbi > Cc: Greg Kroah-Hartman > Cc: Raviteja Garimella > Cc: Michal Nazarewicz Acked-by: Michal Nazarewicz > Cc: "Gustavo A. R. Silva" > Cc: linux-usb@vger.kernel.org > Signed-off-by: Kees Cook > --- > drivers/usb/gadget/udc/snps_udc_core.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c > index 47df99dbaef4..2f5e788dd978 100644 > --- a/drivers/usb/gadget/udc/snps_udc_core.c > +++ b/drivers/usb/gadget/udc/snps_udc_core.c > @@ -1733,7 +1733,7 @@ static void udc_soft_reset(struct udc *dev) > } > > /* RDE timer callback to set RDE bit */ > -static void udc_timer_function(unsigned long v) > +static void udc_timer_function(struct timer_list *unused) > { > u32 tmp; > > @@ -1813,7 +1813,7 @@ static void udc_handle_halt_state(struct udc_ep *ep) > } > > /* Stall timer callback to poll S bit and set it again after */ > -static void udc_pollstall_timer_function(unsigned long v) > +static void udc_pollstall_timer_function(struct timer_list *unused) > { > struct udc_ep *ep; > int halted = 0; > @@ -3067,14 +3067,12 @@ void udc_remove(struct udc *dev) > stop_timer++; > if (timer_pending(&udc_timer)) > wait_for_completion(&on_exit); > - if (udc_timer.data) > - del_timer_sync(&udc_timer); > + del_timer_sync(&udc_timer); > /* remove pollstall timer */ > stop_pollstall_timer++; > if (timer_pending(&udc_pollstall_timer)) > wait_for_completion(&on_pollstall_exit); > - if (udc_pollstall_timer.data) > - del_timer_sync(&udc_pollstall_timer); > + del_timer_sync(&udc_pollstall_timer); > udc = NULL; > } > EXPORT_SYMBOL_GPL(udc_remove); > @@ -3164,10 +3162,6 @@ int udc_probe(struct udc *dev) > u32 reg; > int retval; > > - /* mark timer as not initialized */ > - udc_timer.data = 0; > - udc_pollstall_timer.data = 0; > - > /* device struct setup */ > dev->gadget.ops = &udc_ops; > > @@ -3207,9 +3201,8 @@ int udc_probe(struct udc *dev) > goto finished; > > /* timer init */ > - setup_timer(&udc_timer, udc_timer_function, 1); > - /* timer pollstall init */ > - setup_timer(&udc_pollstall_timer, udc_pollstall_timer_function, 1); > + timer_setup(&udc_timer, udc_timer_function, 0); > + timer_setup(&udc_pollstall_timer, udc_pollstall_timer_function, 0); > > /* set SD */ > reg = readl(&dev->regs->ctl); > -- > 2.7.4 -- Best regards ミハウ “𝓶𝓲𝓷𝓪86” ナザレヴイツ «If at first you don’t succeed, give up skydiving»