summaryrefslogtreecommitdiffstats
path: root/drivers/atm/he.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-14 15:21:36 +0100
committerDavid S. Miller <davem@davemloft.net>2013-04-29 19:26:48 +0200
commitf0911aaea991342ca8346dbcfec3b7575ab22cba (patch)
tree83dfb97719950ab918e728978918b415e0803534 /drivers/atm/he.c
parentMerge branch 'pktdiag' (diff)
downloadlinux-f0911aaea991342ca8346dbcfec3b7575ab22cba.tar.xz
linux-f0911aaea991342ca8346dbcfec3b7575ab22cba.zip
atm: he: use mdelay instead of large udelay constants
ARM cannot handle udelay for more than 2 miliseconds, and it is rather bad style to block the cpu for 16ms anyway, so let's use msleep instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Chas Williams <chas@cmf.nrl.navy.mil> Cc: linux-atm-general@lists.sourceforge.net Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/atm/he.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index d6891267f5bb..507362a76a73 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -1055,7 +1055,7 @@ static int he_start(struct atm_dev *dev)
he_writel(he_dev, 0x0, RESET_CNTL);
he_writel(he_dev, 0xff, RESET_CNTL);
- udelay(16*1000); /* 16 ms */
+ msleep(16); /* 16 ms */
status = he_readl(he_dev, RESET_CNTL);
if ((status & BOARD_RST_STATUS) == 0) {
hprintk("reset failed\n");