From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752629AbdDIBmZ (ORCPT ); Sat, 8 Apr 2017 21:42:25 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33908 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbdDIBmE (ORCPT ); Sat, 8 Apr 2017 21:42:04 -0400 From: Geliang Tang To: Cliff Whickman , Robin Holt Cc: Geliang Tang , linux-kernel@vger.kernel.org Subject: [PATCH] SGI-XP: use setup_timer Date: Sun, 9 Apr 2017 09:41:33 +0800 Message-Id: <49f7f9cc3f873ad15e562d74d2fb6a117764b06c.1490603146.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <0ff6e139159043e3416b0e5bc89e9aa5399bbb8e.1490601847.git.geliangtang@gmail.com> References: <0ff6e139159043e3416b0e5bc89e9aa5399bbb8e.1490601847.git.geliangtang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- drivers/misc/sgi-xp/xpc_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 7f32712..a1b6f75 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -931,10 +931,9 @@ xpc_setup_partitions(void) part->act_state = XPC_P_AS_INACTIVE; XPC_SET_REASON(part, 0, 0); - init_timer(&part->disengage_timer); - part->disengage_timer.function = - xpc_timeout_partition_disengage; - part->disengage_timer.data = (unsigned long)part; + setup_timer(&part->disengage_timer, + xpc_timeout_partition_disengage, + (unsigned long)part); part->setup_state = XPC_P_SS_UNSET; init_waitqueue_head(&part->teardown_wq); -- 2.9.3