From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932576AbdJ3RIj (ORCPT ); Mon, 30 Oct 2017 13:08:39 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:50153 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932502AbdJ3RIf (ORCPT ); Mon, 30 Oct 2017 13:08:35 -0400 X-Google-Smtp-Source: ABhQp+Tqx8Kf7uJ92/zo/XopcJT0Na1xtMYinUkPheBhK1pT2WnXbnhvC4mI067iv6X+Om7vgXD4Cg== From: Douglas Anderson To: balbi@kernel.org, johnyoun@synopsys.com Cc: stefan.wahren@i2se.com, amstan@chromium.org, linux-rockchip@lists.infradead.org, gregkh@linuxfoundation.org, johan@kernel.org, eric@anholt.net, mka@chromium.org, john.stultz@linaro.org, linux-rpi-kernel@lists.infradead.org, jwerner@chromium.org, Douglas Anderson , Kees Cook , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] usb: dwc2: host: Convert hcd_queue to timer_setup Date: Mon, 30 Oct 2017 10:08:01 -0700 Message-Id: <20171030170802.14489-2-dianders@chromium.org> X-Mailer: git-send-email 2.15.0.rc2.357.g7e34df9404-goog In-Reply-To: <20171030170802.14489-1-dianders@chromium.org> References: <20171030170802.14489-1-dianders@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert the timers in hcd_queue to use the new timer_setup() call introduced in commit 686fef928bba ("timer: Prepare to change timer callback argument type"). Suggested-by: Stefan Wahren Signed-off-by: Douglas Anderson Cc: Kees Cook --- Changes in v3: - Convert hcd_queue to timer_setup new for v3 drivers/usb/dwc2/hcd_queue.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c index bea0aadd756e..6f5b5c8b0467 100644 --- a/drivers/usb/dwc2/hcd_queue.c +++ b/drivers/usb/dwc2/hcd_queue.c @@ -1275,11 +1275,11 @@ static void dwc2_do_unreserve(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) * release the reservation. This worker is called after the appropriate * delay. * - * @work: Pointer to a qh unreserve_work. + * @t: Pointer to unreserve_timer in a qh. */ -static void dwc2_unreserve_timer_fn(unsigned long data) +static void dwc2_unreserve_timer_fn(struct timer_list *t) { - struct dwc2_qh *qh = (struct dwc2_qh *)data; + struct dwc2_qh *qh = from_timer(qh, t, unreserve_timer); struct dwc2_hsotg *hsotg = qh->hsotg; unsigned long flags; @@ -1461,11 +1461,11 @@ static void dwc2_deschedule_periodic(struct dwc2_hsotg *hsotg, * to retry some time later. This function handles that timer and moves the * qh back to the "inactive" list, then queues transactions. * - * @data: Pointer to a qh to re-schedule. + * @t: Pointer to wait_timer in a qh. */ -static void dwc2_wait_timer_fn(unsigned long data) +static void dwc2_wait_timer_fn(struct timer_list *t) { - struct dwc2_qh *qh = (struct dwc2_qh *)data; + struct dwc2_qh *qh = from_timer(qh, t, wait_timer); struct dwc2_hsotg *hsotg = qh->hsotg; unsigned long flags; @@ -1518,9 +1518,8 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, /* Initialize QH */ qh->hsotg = hsotg; - setup_timer(&qh->unreserve_timer, dwc2_unreserve_timer_fn, - (unsigned long)qh); - setup_timer(&qh->wait_timer, dwc2_wait_timer_fn, (unsigned long)qh); + timer_setup(&qh->unreserve_timer, dwc2_unreserve_timer_fn, 0); + timer_setup(&qh->wait_timer, dwc2_wait_timer_fn, 0); qh->ep_type = ep_type; qh->ep_is_in = ep_is_in; -- 2.15.0.rc2.357.g7e34df9404-goog