]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
wan: Use usleep_range()
authorManuel Schölling <manuel.schoelling@gmx.de>
Sat, 31 May 2014 15:07:51 +0000 (17:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2014 00:01:33 +0000 (17:01 -0700)
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>
drivers/net/wan/farsync.c

index bcfff0d62de4f2070d5ac644a3becfedb74e3462..02f6d1cebc1541f58e8f8489b14f20fc8cea70f2 100644 (file)
@@ -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