From patchwork Tue Oct 10 22:07:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 824098 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="he52U3yU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yBWSM0yB2z9t3R for ; Wed, 11 Oct 2017 09:07:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756166AbdJJWHa (ORCPT ); Tue, 10 Oct 2017 18:07:30 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:45195 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756653AbdJJWH3 (ORCPT ); Tue, 10 Oct 2017 18:07:29 -0400 Received: by mail-pf0-f172.google.com with SMTP id d28so3971737pfe.2 for ; Tue, 10 Oct 2017 15:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=W+PEsNRQ1fwtcCtK1FpoPQdjsW5Ebfxbn8IvScotlsQ=; b=he52U3yUrzWVLYdhEV9G2i4gC4fTauk458YpDLhuXr0+JQ/+GE76JKyx2udGCYzyIW w0Oah5+63PXW21gzfuyaChPajCaRPI27fkGuhkRvdUQb/cSplpUhQkwNwtQJTVzyjY+w QRLy1Fcc8MnThaUdg4sF90N4MNmjzHqsgjrOM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=W+PEsNRQ1fwtcCtK1FpoPQdjsW5Ebfxbn8IvScotlsQ=; b=rc9tJlrlSPCdbJ8t9i4lNJQvtvuxK8KnFkZy3Ipu+WvFnujXkU4usfk2XCRoowOEZL 5ciidEDaP0E39CX7kW3gqhztzrgGbKIVxuQ/X6Y2h9kti0xQjhCpyJP84bO9Cl6rsi3A qtnYMmBh+2ErD9xY5VHHMpaZvb3P6ZQW0m2UK+rU+uquAJ6YEbv+x7JTbO8AFXPLwCSv e9nEK1SnfDJKAu7dTVhNJNueUcqyzsixXWfNszN9UBv+qbDCpGAAPlsUigOA+pHiT2Zi dPaTs3woqu31LTK+xfGgxFR3NseRvlMAR3KRqS6psdARp0qdszrBcBcIIKa3ANvih59C iLxw== X-Gm-Message-State: AMCzsaU26VbG25rxM+rg66QD41Ro0JWLh/iX0syen7b+1/N4r9SXkJrH mIjCHGuOcxLLHv/XNgiV7MyTj2nbCpg= X-Google-Smtp-Source: AOwi7QBTOCv89IlFlUvkrzhR7jGjUm+arTkPfcwrJcXwgrF94j5Ln43AGNJJDh1BNzg1Nucbewo02Q== X-Received: by 10.98.12.203 with SMTP id 72mr14548961pfm.263.1507673249279; Tue, 10 Oct 2017 15:07:29 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id j18sm26506854pfh.161.2017.10.10.15.07.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Oct 2017 15:07:28 -0700 (PDT) Date: Tue, 10 Oct 2017 15:07:27 -0700 From: Kees Cook To: "David S. Miller" Cc: Geliang Tang , Ingo Molnar , sparclinux@vger.kernel.org, Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH] sparc/led: Convert timers to use timer_setup() Message-ID: <20171010220727.GA97619@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 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. Adds a static variable to hold timeout value. Cc: "David S. Miller" Cc: Geliang Tang Cc: Ingo Molnar Cc: sparclinux@vger.kernel.org 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. --- arch/sparc/kernel/led.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index e278bf52963b..519f5ba7ed7e 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c @@ -31,19 +31,20 @@ static inline void led_toggle(void) } static struct timer_list led_blink_timer; +static unsigned long led_blink_timer_timeout; -static void led_blink(unsigned long timeout) +static void led_blink(struct timer_list *unused) { + unsigned long timeout = led_blink_timer_timeout; + led_toggle(); /* reschedule */ if (!timeout) { /* blink according to load */ led_blink_timer.expires = jiffies + ((1 + (avenrun[0] >> FSHIFT)) * HZ); - led_blink_timer.data = 0; } else { /* blink at user specified interval */ led_blink_timer.expires = jiffies + (timeout * HZ); - led_blink_timer.data = timeout; } add_timer(&led_blink_timer); } @@ -88,9 +89,11 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer, } else if (!strcmp(buf, "toggle")) { led_toggle(); } else if ((*buf > '0') && (*buf <= '9')) { - led_blink(simple_strtoul(buf, NULL, 10)); + led_blink_timer_timeout = simple_strtoul(buf, NULL, 10); + led_blink(&led_blink_timer); } else if (!strcmp(buf, "load")) { - led_blink(0); + led_blink_timer_timeout = 0; + led_blink(&led_blink_timer); } else { auxio_set_led(AUXIO_LED_OFF); } @@ -115,8 +118,7 @@ static struct proc_dir_entry *led; static int __init led_init(void) { - init_timer(&led_blink_timer); - led_blink_timer.function = led_blink; + timer_setup(&led_blink_timer, led_blink, 0); led = proc_create("led", 0, NULL, &led_proc_fops); if (!led)