Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8db4ec66 authored by Manuel Schölling's avatar Manuel Schölling Committed by David S. Miller
Browse files

wan: Use usleep_range() 



Instead of using a jiffies hack we can use the standard api for delays.

Signed-off-by: default avatarManuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6d9b514

drivers/net/wan/farsync.c

+3 −7
Original line number Diff line number Diff line
@@ -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