From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752112AbdIVLQw (ORCPT ); Fri, 22 Sep 2017 07:16:52 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36175 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbdIVLQt (ORCPT ); Fri, 22 Sep 2017 07:16:49 -0400 X-Google-Smtp-Source: AOwi7QCOYrPaQA2N9F0GSAhpwYqnQaE+z6K6tsbOMczgkdo+Oec1KgcNnlIbEKGrJBQ7Foc5brJFZw== From: Allen Pais To: linux-kernel@vger.kernel.org Cc: ed.cashin@acm.org, Allen Pais Subject: [PATCH 1/5] block: amiflop: use setup_timer() helper. Date: Fri, 22 Sep 2017 16:46:35 +0530 Message-Id: <1506078999-4723-2-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506078999-4723-1-git-send-email-allen.lkml@gmail.com> References: <1506078999-4723-1-git-send-email-allen.lkml@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais --- drivers/block/amiflop.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 49908c7..c4b1cba 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1792,27 +1792,19 @@ static int __init amiga_floppy_probe(struct platform_device *pdev) floppy_find, NULL, NULL); /* initialize variables */ - init_timer(&motor_on_timer); + setup_timer(&motor_on_timer, motor_on_callback, 0); motor_on_timer.expires = 0; - motor_on_timer.data = 0; - motor_on_timer.function = motor_on_callback; for (i = 0; i < FD_MAX_UNITS; i++) { - init_timer(&motor_off_timer[i]); + setup_timer(&motor_off_timer[i], fd_motor_off, i | 0x80000000); motor_off_timer[i].expires = 0; - motor_off_timer[i].data = i|0x80000000; - motor_off_timer[i].function = fd_motor_off; - init_timer(&flush_track_timer[i]); + setup_timer(&flush_track_timer[i], flush_track_callback, i); flush_track_timer[i].expires = 0; - flush_track_timer[i].data = i; - flush_track_timer[i].function = flush_track_callback; unit[i].track = -1; } - init_timer(&post_write_timer); + setup_timer(&post_write_timer, post_write, 0); post_write_timer.expires = 0; - post_write_timer.data = 0; - post_write_timer.function = post_write; for (i = 0; i < 128; i++) mfmdecode[i]=255; -- 2.7.4