diff options
| author |   Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-31 17:07:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-06-02 17:01:33 -0700 |
| commit | 8db4ec6641db69f59314894bad6ed7b609e691f6 (patch) | |
| tree | e8164194b894140f346626b860bf4e5ada4d17dd /drivers/net/wan | |
| parent | vxge: Remove useless return variables (diff) | |
| download | linux-dev-8db4ec6641db69f59314894bad6ed7b609e691f6.tar.xz linux-dev-8db4ec6641db69f59314894bad6ed7b609e691f6.zip | |
wan: Use usleep_range()
Instead of using a jiffies hack we can use the standard api for delays.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/farsync.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index bcfff0d62de4..02f6d1cebc15 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -26,6 +26,7 @@ #include <linux/ioport.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/delay.h> #include <linux/if.h> #include <linux/hdlc.h> #include <asm/io.h> @@ -678,7 +679,6 @@ static inline void fst_cpureset(struct fst_card_info *card) { unsigned char interrupt_line_register; - unsigned long j = jiffies + 1; unsigned int regval; if (card->family == FST_FAMILY_TXU) { @@ -696,16 +696,12 @@ fst_cpureset(struct fst_card_info *card) /* * We are delaying here to allow the 9054 to reset itself */ - j = jiffies + 1; - while (jiffies < j) - /* Do nothing */ ; + usleep_range(10, 20); outw(0x240f, card->pci_conf + CNTRL_9054 + 2); /* * We are delaying here to allow the 9054 to reload its eeprom */ - j = jiffies + 1; - while (jiffies < j) - /* Do nothing */ ; + usleep_range(10, 20); outw(0x040f, card->pci_conf + CNTRL_9054 + 2); if (pci_write_config_byte |