hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ag71xx: replace delay with sleep calls 

I don't see that we're in an atomic context so there's no need to
busy-wait. Therefore replace the delay with sleep calls.
See also Documentation/timers/timers-howto.txt. It states:
"In general, use of mdelay is discouraged and code should
be refactored to allow for the use of msleep."

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43539 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-12-07 16:53:09 +00:00
parent 09011d5a28
commit beecdee389
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
View File

@ -445,7 +445,7 @@ static int __ar7240sw_reg_wait(struct mii_bus *mii, u32 reg, u32 mask, u32 val,
if ((t & mask) == val)
return 0;
msleep(1);
usleep_range(1000, 2000);
}
return -ETIMEDOUT;
@ -654,7 +654,7 @@ static int ar7240sw_reset(struct ar7240sw *as)
ar7240sw_disable_port(as, i);
/* Wait for transmit queues to drain. */
msleep(2);
usleep_range(2000, 3000);
/* Reset the switch. */
ar7240sw_reg_write(mii, AR7240_REG_MASK_CTRL,

8
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View File

@ -470,18 +470,18 @@ static void ag71xx_hw_init(struct ag71xx *ag)
reset_mask &= ~(AR71XX_RESET_GE0_PHY | AR71XX_RESET_GE1_PHY);
ath79_device_reset_set(reset_phy);
mdelay(50);
msleep(50);
ath79_device_reset_clear(reset_phy);
mdelay(200);
msleep(200);
}
ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
udelay(20);
ath79_device_reset_set(reset_mask);
mdelay(100);
msleep(100);
ath79_device_reset_clear(reset_mask);
mdelay(200);
msleep(200);
ag71xx_hw_setup(ag);