Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751873AbdHaX34 (ORCPT ); Thu, 31 Aug 2017 19:29:56 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:33656 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751363AbdHaX3y (ORCPT ); Thu, 31 Aug 2017 19:29:54 -0400 X-Google-Smtp-Source: ADKCNb5KPa4hfKEugQdj2Bm3eoolGMcSw8q/GLOaotVQpA+Na3jlBxfIwX1qRG9+3S9bnsNh3+wj/g== From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH 04/31] timer: Remove init_timer_on_stack() in favor of setup_timer_on_stack() Date: Thu, 31 Aug 2017 16:29:16 -0700 Message-Id: <1504222183-61202-5-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504222183-61202-1-git-send-email-keescook@chromium.org> References: <1504222183-61202-1-git-send-email-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5297 Lines: 135 Remove uses of init_timer_on_stack() with open-coded function and data assignments that could be expressed using setup_timer_on_stack(). Signed-off-by: Kees Cook --- drivers/base/power/main.c | 4 +--- drivers/firewire/core-transaction.c | 2 +- drivers/parport/ieee1284.c | 7 ++----- drivers/s390/char/tape_std.c | 8 +++----- drivers/s390/net/lcs.c | 7 ++----- drivers/scsi/qla1280.c | 8 +++----- include/linux/timer.h | 2 -- 7 files changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index c99f8730de82..227051ef21df 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -503,11 +503,9 @@ static void dpm_watchdog_set(struct dpm_watchdog *wd, struct device *dev) wd->dev = dev; wd->tsk = current; - init_timer_on_stack(timer); + setup_timer_on_stack(timer, dpm_watchdog_handler, (unsigned long)wd); /* use same timeout value for both suspend and resume */ timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_TIMEOUT; - timer->function = dpm_watchdog_handler; - timer->data = (unsigned long)wd; add_timer(timer); } diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index d6a09b9cd8cc..6c428f1004f3 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -423,7 +423,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id, struct transaction_callback_data d; struct fw_transaction t; - init_timer_on_stack(&t.split_timeout_timer); + setup_timer_on_stack(&t.split_timeout_timer, NULL, 0UL); init_completion(&d.done); d.payload = payload; fw_send_request(card, &t, tcode, destination_id, generation, speed, diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index 74cc6dd982d2..ae289d56be8e 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c @@ -76,13 +76,10 @@ int parport_wait_event (struct parport *port, signed long timeout) semaphore. */ return 1; - init_timer_on_stack(&timer); - timer.expires = jiffies + timeout; - timer.function = timeout_waiting_on_port; + setup_timer_on_stack(&timer, timeout_waiting_on_port, port->number); port_from_cookie[port->number % PARPORT_MAX] = port; - timer.data = port->number; - add_timer (&timer); + mod_timer(&timer, jiffies + timeout); ret = down_interruptible (&port->physport->ieee1284.irq); if (!del_timer_sync(&timer) && !ret) /* Timed out. */ diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 3478e19ae194..a1213f2fadd5 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c @@ -70,11 +70,9 @@ tape_std_assign(struct tape_device *device) * to another host (actually this shouldn't happen but it does). * So we set up a timeout for this call. */ - init_timer_on_stack(&timeout); - timeout.function = tape_std_assign_timeout; - timeout.data = (unsigned long) request; - timeout.expires = jiffies + 2 * HZ; - add_timer(&timeout); + setup_timer_on_stack(&timeout, tape_std_assign_timeout, + (unsigned long)request); + mod_timer(&timeout, jiffies + 2 * HZ); rc = tape_do_io_interruptible(device, request); diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 619da81dca70..2d7779256e6f 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -890,11 +890,8 @@ lcs_send_lancmd(struct lcs_card *card, struct lcs_buffer *buffer, rc = lcs_ready_buffer(&card->write, buffer); if (rc) return rc; - init_timer_on_stack(&timer); - timer.function = lcs_lancmd_timeout; - timer.data = (unsigned long) reply; - timer.expires = jiffies + HZ*card->lancmd_timeout; - add_timer(&timer); + setup_timer_on_stack(&timer, lcs_lancmd_timeout, (unsigned long)reply); + mod_timer(&timer, jiffies + HZ * card->lancmd_timeout); wait_event(reply->wait_q, reply->received); del_timer_sync(&timer); destroy_timer_on_stack(&timer); diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 8a29fb09db14..4f4fba222201 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -2494,11 +2494,9 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb) /* Issue set host interrupt command. */ /* set up a timer just in case we're really jammed */ - init_timer_on_stack(&timer); - timer.expires = jiffies + 20*HZ; - timer.data = (unsigned long)ha; - timer.function = qla1280_mailbox_timeout; - add_timer(&timer); + setup_timer_on_stack(&timer, qla1280_mailbox_timeout, + (unsigned long)ha); + mod_timer(&timer, jiffies + 20 * HZ); spin_unlock_irq(ha->host->host_lock); WRT_REG_WORD(®->host_cmd, HC_SET_HOST_INT); diff --git a/include/linux/timer.h b/include/linux/timer.h index 1b2bb2d978de..959ba660aef0 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -132,8 +132,6 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, __init_timer((timer), TIMER_PINNED) #define init_timer_deferrable(timer) \ __init_timer((timer), TIMER_DEFERRABLE) -#define init_timer_on_stack(timer) \ - __init_timer_on_stack((timer), 0) #define __setup_timer(_timer, _fn, _data, _flags) \ do { \ -- 2.7.4