From patchwork Wed Oct 4 23:27:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9985887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B0DF6602B8 for ; Wed, 4 Oct 2017 23:29:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A321128BF1 for ; Wed, 4 Oct 2017 23:29:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97A1728C12; Wed, 4 Oct 2017 23:29:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F1E028BF1 for ; Wed, 4 Oct 2017 23:29:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751663AbdJDX2P (ORCPT ); Wed, 4 Oct 2017 19:28:15 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:55635 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435AbdJDX2D (ORCPT ); Wed, 4 Oct 2017 19:28:03 -0400 Received: by mail-pg0-f47.google.com with SMTP id b11so7311166pgn.12 for ; Wed, 04 Oct 2017 16:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8cZbW/NVZyz3UVLg6X+8KLxDaf0Gq86t5+0lrN6rL0U=; b=N01WJ0bLzfsC9/LQfS5Smolsgoz7e6SHi3bSoL690wgIJe+se2+4IeU0TXcjr+8SR/ hYob/sSTbKwy+wJRFsZHptX0s3iHPMcdijtlnhuE9PlH+JXpa786MgZxF5Qihi7Ql9/q v6eFs0nwAI6VNch5ZBSsY9X8vRBup4znqM01o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8cZbW/NVZyz3UVLg6X+8KLxDaf0Gq86t5+0lrN6rL0U=; b=nC5oU6zdyeoryIizqFyLLrfAAu5pz9+gi4lzqHkIgO0VOAMFGQWgOGHQUC46z7x7XY 0VgSKAQk8jhNl9pWiKU0Qa6lZoCKRMW+LMcVOf+HWLy7SIWKqMKoG5aK2RhFixh8plAz ak0ASeVd+36xAXXNTG85S4KWkX4QfP3EYgqoKSXHbrHHkJbihuZUjnb1EPmG+7brHY55 J+9OiN8YTOX9CbrXQlQn61vQkXEBecN4J8e7/kbuJZ6lFnEzoUSVXjt2HLbEV/kskU8f OZ411p4XseLYj10w+DJAA1Np1Gwf7jva0ZIDTc0UEywKBTYfN6gNtKVhzQzWk66kIURu qRTA== X-Gm-Message-State: AMCzsaXNqaFfnG9mbIpvgGyu1K/yKfnIOBfJDwDh3WGMxiKJ4bSZ6XSD pSRUJajQPIi6vz6+pNIKhdRHtA== X-Google-Smtp-Source: AOwi7QDmXblToLPAwFlwJ+KFgWlToFfBdX54O2RtckUfJ8j+hHQNEfgeUGUna1kSnkTlmlMhZruVpg== X-Received: by 10.101.78.130 with SMTP id b2mr13085633pgs.160.1507159682431; Wed, 04 Oct 2017 16:28:02 -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 v14sm10213985pgc.78.2017.10.04.16.27.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 16:27:57 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , Arnd Bergmann , Greg Kroah-Hartman , Mark Gross , Andrew Morton , Benjamin Herrenschmidt , Chris Metcalf , Geert Uytterhoeven , Guenter Roeck , Harish Patil , Heiko Carstens , "James E.J. Bottomley" , John Stultz , Julian Wiedmann , Kalle Valo , Lai Jiangshan , Len Brown , Manish Chopra , "Martin K. Petersen" , Martin Schwidefsky , Michael Ellerman , Michael Reed , netdev@vger.kernel.org, Oleg Nesterov , Paul Mackerras , Pavel Machek , Petr Mladek , "Rafael J. Wysocki" , Ralf Baechle , Sebastian Reichel , Stefan Richter , Stephen Boyd , Sudip Mukherjee , Tejun Heo , Ursula Braun , Viresh Kumar , Wim Van Sebroeck , linux1394-devel@lists.sourceforge.net, linux-mips@linux-mips.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER Date: Wed, 4 Oct 2017 16:27:01 -0700 Message-Id: <1507159627-127660-8-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507159627-127660-1-git-send-email-keescook@chromium.org> References: <1507159627-127660-1-git-send-email-keescook@chromium.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drops the last user of TIMER_INITIALIZER and adapts timer.h to use the internal version. Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Mark Gross Cc: Thomas Gleixner Signed-off-by: Kees Cook --- drivers/char/tlclk.c | 12 +++++------- include/linux/timer.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index 6210bff46341..8eeb4190207d 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c @@ -184,9 +184,8 @@ static unsigned int telclk_interrupt; static int int_events; /* Event that generate a interrupt */ static int got_event; /* if events processing have been done */ -static void switchover_timeout(unsigned long data); -static struct timer_list switchover_timer = - TIMER_INITIALIZER(switchover_timeout , 0, 0); +static void switchover_timeout(struct timer_list *t); +static struct timer_list switchover_timer; static unsigned long tlclk_timer_data; static struct tlclk_alarms *alarm_events; @@ -805,7 +804,7 @@ static int __init tlclk_init(void) goto out3; } - init_timer(&switchover_timer); + timer_setup(&switchover_timer, switchover_timeout, 0); ret = misc_register(&tlclk_miscdev); if (ret < 0) { @@ -855,9 +854,9 @@ static void __exit tlclk_cleanup(void) } -static void switchover_timeout(unsigned long data) +static void switchover_timeout(struct timer_list *unused) { - unsigned long flags = *(unsigned long *) data; + unsigned long flags = tlclk_timer_data; if ((flags & 1)) { if ((inb(TLCLK_REG1) & 0x08) != (flags & 0x08)) @@ -922,7 +921,6 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id) /* TIMEOUT in ~10ms */ switchover_timer.expires = jiffies + msecs_to_jiffies(10); tlclk_timer_data = inb(TLCLK_REG1); - switchover_timer.data = (unsigned long) &tlclk_timer_data; mod_timer(&switchover_timer, switchover_timer.expires); } else { got_event = 1; diff --git a/include/linux/timer.h b/include/linux/timer.h index 10cc45ca5803..4f7476e4a727 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -87,7 +87,7 @@ struct timer_list { #define DEFINE_TIMER(_name, _function, _expires, _data) \ struct timer_list _name = \ - TIMER_INITIALIZER(_function, _expires, _data) + __TIMER_INITIALIZER(_function, _expires, _data, 0) void init_timer_key(struct timer_list *timer, unsigned int flags, const char *name, struct lock_class_key *key);