Received: with ECARTIS (v1.0.0; list netdev); Sun, 06 Mar 2005 02:33:58 -0800 (PST) Received: from trashy.coderock.org (postfix@coderock.org [193.77.147.115]) by oss.sgi.com (8.13.0/8.13.0) with ESMTP id j26AXn7j019808 for ; Sun, 6 Mar 2005 02:33:49 -0800 Received: by trashy.coderock.org (Postfix, from userid 780) id 83B341F205; Sun, 6 Mar 2005 11:33:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by trashy.coderock.org (Postfix) with ESMTP id A476C1F23C; Sun, 6 Mar 2005 11:33:45 +0100 (CET) Received: from localhost.localdomain (localhost [127.0.0.1]) by trashy.coderock.org (Postfix) with ESMTP id B5BDF1F205; Sun, 6 Mar 2005 11:33:25 +0100 (CET) Subject: [patch 15/26] net/skethtool: remove duplicate delay To: jgarzik@pobox.com Cc: netdev@oss.sgi.com, domen@coderock.org, nacc@us.ibm.com From: domen@coderock.org Date: Sun, 06 Mar 2005 11:33:25 +0100 Message-Id: <20050306103325.B5BDF1F205@trashy.coderock.org> X-Virus-Scanned: ClamAV 0.83/748/Fri Mar 4 14:19:11 2005 on oss.sgi.com X-Virus-Status: Clean X-archive-position: 2497 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: domen@coderock.org Precedence: bulk X-list: netdev Content-Length: 1007 Lines: 30 Please consider applying. Remove an unnecessary second (and identical) delay. schedule_timeout() does not need to be called, as msleep_interruptible() already delayed the task. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- kj-domen/drivers/net/sk98lin/skethtool.c | 3 --- 1 files changed, 3 deletions(-) diff -puN drivers/net/sk98lin/skethtool.c~remove_duplicate_delay-drivers_net_sk98lin_skethtool drivers/net/sk98lin/skethtool.c --- kj/drivers/net/sk98lin/skethtool.c~remove_duplicate_delay-drivers_net_sk98lin_skethtool 2005-03-05 16:11:09.000000000 +0100 +++ kj-domen/drivers/net/sk98lin/skethtool.c 2005-03-05 16:11:09.000000000 +0100 @@ -437,9 +437,6 @@ static int locateDevice(struct net_devic pAC->LedsOn = 0; mod_timer(&pAC->BlinkTimer, jiffies); msleep_interruptible(data * 1000); - - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(data * HZ); del_timer_sync(&pAC->BlinkTimer); toggleLeds(pNet, 0); _