From: Nicholas Mc Guire Date: Wed, 4 Feb 2015 08:07:40 +0000 (-0500) Subject: orinoco: orinoco_pci use msecs_to_jiffies for conversion X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3427da4597ae2bf909a7f6f0c7bc48b07215c009;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git orinoco: orinoco_pci use msecs_to_jiffies for conversion This is only an API consolidation and should make things more readable it replaces var * HZ / 1000 by msecs_to_jiffies(var). Signed-off-by: Nicholas Mc Guire Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c index b6bdad632842..74219d59d7e1 100644 --- a/drivers/net/wireless/orinoco/orinoco_pci.c +++ b/drivers/net/wireless/orinoco/orinoco_pci.c @@ -94,7 +94,7 @@ static int orinoco_pci_cor_reset(struct orinoco_private *priv) mdelay(HERMES_PCI_COR_OFFT); /* The card is ready when it's no longer busy */ - timeout = jiffies + (HERMES_PCI_COR_BUSYT * HZ / 1000); + timeout = jiffies + msecs_to_jiffies(HERMES_PCI_COR_BUSYT); reg = hermes_read_regn(hw, CMD); while (time_before(jiffies, timeout) && (reg & HERMES_CMD_BUSY)) { mdelay(1);