From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751728AbdIUMVH (ORCPT ); Thu, 21 Sep 2017 08:21:07 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36696 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbdIUMVG (ORCPT ); Thu, 21 Sep 2017 08:21:06 -0400 X-Google-Smtp-Source: AOwi7QBoz3tSgxTaQUPrJJcdevW8x0GjT/xeMpvWoJV4iNwpR17LB67aILDvLGILzdOLMTQBtHo56w== From: Allen Pais To: linux-kernel@vger.kernel.org Cc: jwi@linux.vnet.ibm.com, ubraun@linux.vnet.ibm.com, linux-s390@vger.kernel.org, Allen Pais Subject: [PATCH 1/1] drivers:s390: use setup_timer Date: Thu, 21 Sep 2017 17:50:58 +0530 Message-Id: <1505996458-11714-1-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 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/s390/net/fsm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index e5dea67..8c14c6c 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c @@ -170,9 +170,7 @@ fsm_addtimer(fsm_timer *this, int millisec, int event, void *arg) this->fi->name, this, millisec); #endif - init_timer(&this->tl); - this->tl.function = (void *)fsm_expire_timer; - this->tl.data = (long)this; + setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this); this->expire_event = event; this->event_arg = arg; this->tl.expires = jiffies + (millisec * HZ) / 1000; @@ -191,9 +189,7 @@ fsm_modtimer(fsm_timer *this, int millisec, int event, void *arg) #endif del_timer(&this->tl); - init_timer(&this->tl); - this->tl.function = (void *)fsm_expire_timer; - this->tl.data = (long)this; + setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this); this->expire_event = event; this->event_arg = arg; this->tl.expires = jiffies + (millisec * HZ) / 1000; -- 2.7.4