From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751680AbdJRUe4 (ORCPT ); Wed, 18 Oct 2017 16:34:56 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:45107 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751710AbdJRUdf (ORCPT ); Wed, 18 Oct 2017 16:33:35 -0400 X-Google-Smtp-Source: AOwi7QDFdGxaVpLL2gqB8PETl7PkpnltQ7ihWY2pjzeFn6iVFqi03mc5Z8y1gPJBebgobi8k7KOrKA== Date: Wed, 18 Oct 2017 13:33:33 -0700 From: Kees Cook To: Thomas Gleixner Cc: "Martin K. Petersen" , linux-kernel@vger.kernel.org Subject: [PATCH] scsi: gdth: Convert timers to use timer_setup() Message-ID: <20171018203333.GA144628@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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. Signed-off-by: Kees Cook Reviewed-by: Martin K. Petersen --- This is a resend to tglx, with Reviews/Acks. Martin Petersen suggested that scsi timer conversions should go via the timer tree. --- drivers/scsi/gdth.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a4473356a9dc..c35f05c4c6bb 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -3705,7 +3705,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) #ifdef GDTH_STATISTICS static u8 gdth_timer_running; -static void gdth_timeout(unsigned long data) +static void gdth_timeout(struct timer_list *unused) { u32 i; Scsi_Cmnd *nscp; @@ -3743,8 +3743,6 @@ static void gdth_timer_init(void) gdth_timer_running = 1; TRACE2(("gdth_detect(): Initializing timer !\n")); gdth_timer.expires = jiffies + HZ; - gdth_timer.data = 0L; - gdth_timer.function = gdth_timeout; add_timer(&gdth_timer); } #else @@ -5165,7 +5163,7 @@ static int __init gdth_init(void) /* initializations */ gdth_polling = TRUE; gdth_clear_events(); - init_timer(&gdth_timer); + timer_setup(&gdth_timer, gdth_timeout, 0); /* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) { -- 2.7.4 -- Kees Cook Pixel Security