From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbdJFUTn (ORCPT ); Fri, 6 Oct 2017 16:19:43 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36569 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491AbdJFUTl (ORCPT ); Fri, 6 Oct 2017 16:19:41 -0400 X-Google-Smtp-Source: AOwi7QAQxKC4vS6wP8RtttnTw/Re2WSu8t20U2T3kdmLDYJAoWy7vK66N5hUSxTebqJ263TOU3nJZg== Subject: Re: [PATCH] led/ledtrig-heartbeat: Convert timers to use To: Kees Cook , linux-kernel@vger.kernel.org References: <20171005004934.GA23081@beast> Cc: Richard Purdie , Pavel Machek , Zhang Bo , Linus Walleij , Ingo Molnar , linux-leds@vger.kernel.org, Thomas Gleixner From: Jacek Anaszewski X-Enigmail-Draft-Status: N1110 Message-ID: Date: Fri, 6 Oct 2017 22:18:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20171005004934.GA23081@beast> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kees, Thanks for the patch. On 10/05/2017 02:49 AM, Kees Cook wrote: > Instead of using .data directly, convert to from_timer. Since the > trigger_data is allocated separately, the led_cdev must be explicitly > tracked for the callback. > > Cc: Richard Purdie > Cc: Jacek Anaszewski > Cc: Pavel Machek > Cc: Zhang Bo > Cc: Linus Walleij > Cc: Ingo Molnar > Cc: linux-leds@vger.kernel.org > Cc: Thomas Gleixner > Signed-off-by: Kees Cook > --- > This requires commit 686fef928bba ("timer: Prepare to change timer > callback argument type") in v4.14-rc3, but should be otherwise > stand-alone. > --- > drivers/leds/trigger/ledtrig-heartbeat.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c > index e95ea65380c8..f0896de410b8 100644 > --- a/drivers/leds/trigger/ledtrig-heartbeat.c > +++ b/drivers/leds/trigger/ledtrig-heartbeat.c > @@ -25,19 +25,23 @@ > static int panic_heartbeats; > > struct heartbeat_trig_data { > + struct led_classdev *led_cdev; > unsigned int phase; > unsigned int period; > struct timer_list timer; > unsigned int invert; > }; > > -static void led_heartbeat_function(unsigned long data) > +static void led_heartbeat_function(struct timer_list *t) > { > - struct led_classdev *led_cdev = (struct led_classdev *) data; > - struct heartbeat_trig_data *heartbeat_data = led_cdev->trigger_data; > + struct heartbeat_trig_data *heartbeat_data = > + from_timer(heartbeat_data, t, timer); > + struct led_classdev *led_cdev; > unsigned long brightness = LED_OFF; > unsigned long delay = 0; > > + led_cdev = heartbeat_data->led_cdev; > + > if (unlikely(panic_heartbeats)) { > led_set_brightness_nosleep(led_cdev, LED_OFF); > return; > @@ -127,18 +131,18 @@ static void heartbeat_trig_activate(struct led_classdev *led_cdev) > return; > > led_cdev->trigger_data = heartbeat_data; > + heartbeat_data->led_cdev = led_cdev; > rc = device_create_file(led_cdev->dev, &dev_attr_invert); > if (rc) { > kfree(led_cdev->trigger_data); > return; > } > > - setup_timer(&heartbeat_data->timer, > - led_heartbeat_function, (unsigned long) led_cdev); > + timer_setup(&heartbeat_data->timer, led_heartbeat_function, 0); > heartbeat_data->phase = 0; > if (!led_cdev->blink_brightness) > led_cdev->blink_brightness = led_cdev->max_brightness; > - led_heartbeat_function(heartbeat_data->timer.data); > + led_heartbeat_function(&heartbeat_data->timer); > set_bit(LED_BLINK_SW, &led_cdev->work_flags); > led_cdev->activated = true; > } > It seems that the patch title is somewhat incomplete, so I amended it as follows: s/to use/to use timer_setup()/ and applied to the for-next branch of linux-leds.git after rebasing it onto 4.14-rc3. -- Best regards, Jacek Anaszewski