Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753214Ab3EJMOD (ORCPT ); Fri, 10 May 2013 08:14:03 -0400 Received: from mga09.intel.com ([134.134.136.24]:27780 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785Ab3EJMN7 (ORCPT ); Fri, 10 May 2013 08:13:59 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,647,1363158000"; d="scan'208";a="311262588" From: Imre Deak To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Daniel Vetter , Wolfgang Grandegger , Marc Kleine-Budde , Bill Pemberton , "David S. Miller" , Greg Kroah-Hartman , Joe Perches , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 07/11] net/peak_pcmcia: take msecs_to_jiffies_min into use Date: Fri, 10 May 2013 15:13:25 +0300 Message-Id: <1368188011-23661-7-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368188011-23661-1-git-send-email-imre.deak@intel.com> References: <1368188011-23661-1-git-send-email-imre.deak@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1083 Lines: 28 Use msecs_to_jiffies_min instead of open-coding the same. Signed-off-by: Imre Deak --- drivers/net/can/sja1000/peak_pcmcia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c index 1a7020b..3e45e16 100644 --- a/drivers/net/can/sja1000/peak_pcmcia.c +++ b/drivers/net/can/sja1000/peak_pcmcia.c @@ -253,7 +253,7 @@ static inline int pcan_pccard_present(struct pcan_pccard *card) static int pcan_wait_spi_busy(struct pcan_pccard *card) { unsigned long timeout = jiffies + - msecs_to_jiffies(PCC_SPI_MAX_BUSY_WAIT_MS) + 1; + msecs_to_jiffies_min(PCC_SPI_MAX_BUSY_WAIT_MS); /* be sure to read status at least once after sleeping */ while (pcan_read_reg(card, PCC_CSR) & PCC_CSR_SPI_BUSY) { -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/