From patchwork Wed Dec 21 12:57:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 132626 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 00428B7110 for ; Wed, 21 Dec 2011 23:59:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752037Ab1LUM67 (ORCPT ); Wed, 21 Dec 2011 07:58:59 -0500 Received: from mail-qw0-f53.google.com ([209.85.216.53]:50207 "EHLO mail-qw0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751873Ab1LUM65 (ORCPT ); Wed, 21 Dec 2011 07:58:57 -0500 Received: by qadb15 with SMTP id b15so4694753qad.19 for ; Wed, 21 Dec 2011 04:58:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=n/WTjb8Ywws09lhae2BBSPYJk6cYL4xU0v+BFtegHd8=; b=PoimqFBtsPS+P9KLHfC/PoDKCnukZ5ghNL+3uMGuQ11rmGQDrsjhtU1i278lg8bcpM M3hzVdM5LyBntQPTKYss3bhqJ37lgqAH6clcf9/2DMJXBIWxpU5G9whMG7jZYFPpVFsT qctXX97g9Dh4OzNkSnVW305sgNyP1xop9Xf4k= Received: by 10.224.188.80 with SMTP id cz16mr8167980qab.7.1324472336889; Wed, 21 Dec 2011 04:58:56 -0800 (PST) Received: from localhost.localdomain (hchen.csail.mit.edu. [18.26.5.5]) by mx.google.com with ESMTPS id j7sm10529806qaq.11.2011.12.21.04.58.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Dec 2011 04:58:55 -0800 (PST) From: Xi Wang To: Samuel Ortiz Cc: netdev@vger.kernel.org, "David S. Miller" , Xi Wang Subject: [PATCH] irda: use msecs_to_jiffies() rather than manual calculation Date: Wed, 21 Dec 2011 07:57:16 -0500 Message-Id: <1324472236-9681-1-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Also use mod_timer() instead of direct assignment to "expires". Signed-off-by: Xi Wang --- net/irda/af_irda.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index c24f25a..bb14c34 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2558,8 +2558,8 @@ bed: self->errno = 0; setup_timer(&self->watchdog, irda_discovery_timeout, (unsigned long)self); - self->watchdog.expires = jiffies + (val * HZ/1000); - add_timer(&(self->watchdog)); + mod_timer(&self->watchdog, + jiffies + msecs_to_jiffies(val)); /* Wait for IR-LMP to call us back */ __wait_event_interruptible(self->query_wait,