From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932461AbdJXJfV (ORCPT ); Tue, 24 Oct 2017 05:35:21 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:54032 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932287AbdJXJfO (ORCPT ); Tue, 24 Oct 2017 05:35:14 -0400 X-Google-Smtp-Source: ABhQp+QsTF+KQSVutdbqDd3/3i3SeK89Nq9NNfl9kFBk1h14SSTwD6V1xN/a2hrUp4FfaveRB+xCUw== Subject: Re: [PATCH] staging: greybus: Convert timers to use timer_setup() To: Kees Cook , Greg Kroah-Hartman Cc: Johan Hovold , Alex Elder , greybus-dev@lists.linaro.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org References: <20171024082550.GA142933@beast> From: "Bryan O'Donoghue" Message-ID: <3caa07a1-4f46-d879-cfec-586addc006af@nexus-software.ie> Date: Tue, 24 Oct 2017 10:35:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20171024082550.GA142933@beast> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/10/17 09:25, 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. > > Cc: Greg Kroah-Hartman > Cc: "Bryan O'Donoghue" > Cc: Johan Hovold > Cc: Alex Elder > Cc: greybus-dev@lists.linaro.org > Cc: devel@driverdev.osuosl.org > Signed-off-by: Kees Cook > --- > drivers/staging/greybus/loopback.c | 14 ++++---------- > drivers/staging/greybus/operation.c | 7 +++---- > 2 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c > index 08e255884206..045aaf81113a 100644 > --- a/drivers/staging/greybus/loopback.c > +++ b/drivers/staging/greybus/loopback.c > @@ -572,16 +572,11 @@ static void gb_loopback_async_operation_work(struct work_struct *work) > gb_loopback_async_operation_put(op_async); > } > > -static void gb_loopback_async_operation_timeout(unsigned long data) > +static void gb_loopback_async_operation_timeout(struct timer_list *t) > { > - struct gb_loopback_async_operation *op_async; > - u16 id = data; > + struct gb_loopback_async_operation *op_async = > + from_timer(op_async, t, timer); > > - op_async = gb_loopback_operation_find(id); > - if (!op_async) { > - pr_err("operation %d not found - time out ?\n", id); > - return; > - } Hi Kees, you need to add gb_loopback_async_operation_get(op_async); when dropping the gb_loopback_operation_find() call here. > schedule_work(&op_async->work); > } > > @@ -631,8 +626,7 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type, > if (ret) > goto error; > > - setup_timer(&op_async->timer, gb_loopback_async_operation_timeout, > - (unsigned long)operation->id); > + timer_setup(&op_async->timer, gb_loopback_async_operation_timeout, 0); > op_async->timer.expires = jiffies + gb->jiffy_timeout; > add_timer(&op_async->timer); > > diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c > index 3023012808d9..ee4ba3f23bef 100644 > --- a/drivers/staging/greybus/operation.c > +++ b/drivers/staging/greybus/operation.c > @@ -294,9 +294,9 @@ static void gb_operation_work(struct work_struct *work) > gb_operation_put(operation); > } > > -static void gb_operation_timeout(unsigned long arg) > +static void gb_operation_timeout(struct timer_list *t) > { > - struct gb_operation *operation = (void *)arg; > + struct gb_operation *operation = from_timer(operation, t, timer); > > if (gb_operation_result_set(operation, -ETIMEDOUT)) { > /* > @@ -541,8 +541,7 @@ gb_operation_create_common(struct gb_connection *connection, u8 type, > goto err_request; > } > > - setup_timer(&operation->timer, gb_operation_timeout, > - (unsigned long)operation); > + timer_setup(&operation->timer, gb_operation_timeout, 0); > } > > operation->flags = op_flags; > Other than that, the rest looks good to me and you can add my Reviewed-by: Bryan O'Donoghue