From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751497AbdK0HZ7 (ORCPT ); Mon, 27 Nov 2017 02:25:59 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:44580 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751197AbdK0HZ5 (ORCPT ); Mon, 27 Nov 2017 02:25:57 -0500 Subject: Re: [PATCH] s390/drivers: use setup_timer instead of init_timer To: Colin King , Ursula Braun , Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20171124125007.30704-1-colin.king@canonical.com> From: Julian Wiedmann Date: Mon, 27 Nov 2017 08:25:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171124125007.30704-1-colin.king@canonical.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17112707-0020-0000-0000-000003D0D689 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17112707-0021-0000-0000-00004266371B Message-Id: <53a7d0e2-93f6-e69e-ef49-57d3a46714c5@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-27_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711270104 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/24/2017 01:50 PM, Colin King wrote: > From: Colin Ian King > > Use setup_timer function instead of initializing timer with the > function and data fields. > > Signed-off-by: Colin Ian King > --- > drivers/s390/net/fsm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c > index 8c14c6c3ad3d..16b81be1f07a 100644 > --- a/drivers/s390/net/fsm.c > +++ b/drivers/s390/net/fsm.c > @@ -142,13 +142,11 @@ void > fsm_settimer(fsm_instance *fi, fsm_timer *this) > { > this->fi = fi; > - this->tl.function = (void *)fsm_expire_timer; > - this->tl.data = (long)this; > #if FSM_TIMER_DEBUG > printk(KERN_DEBUG "fsm(%s): Create timer %p\n", fi->name, > this); > #endif > - init_timer(&this->tl); > + setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this); > } > > void > Thanks Colin, but looks like Kees beat you to it in Linus' tree.