au1000_eth: use write accessors
Subsystems (2)
PATCH 1/3 au1000_eth: use write accessors
Hi David,
The next 3 patches apply to on top of the patch series that I sent earlier converting au1000_eth to become a platform_driver. Thanks !
--
From: Florian Fainelli <[email protected]>
This patch replaces all occurences of *aup->enable = val by writel(val, &aup->enable)
---
drivers/net/au1000_eth.c +6 -6
@@ -155,10 +155,10 @@ static void enable_mac(struct net_device *dev, int force_reset)spin_lock_irqsave (&aup->lock, flags);if (force_reset || (!aup->mac_enabled)) { - *aup->enable =MAC_EN_CLOCK_ENABLE ; +writel (MAC_EN_CLOCK_ENABLE , &aup->enable);au_sync_delay (2 ); - *aup->enable = (MAC_EN_RESET0 |MAC_EN_RESET1 |MAC_EN_RESET2 - |MAC_EN_CLOCK_ENABLE ); +writel ((MAC_EN_RESET0 |MAC_EN_RESET1 |MAC_EN_RESET2 + |MAC_EN_CLOCK_ENABLE ), &aup->enable);au_sync_delay (2 ); aup->mac_enabled =1 ;
@@ -486,9 +486,9 @@ static void reset_mac_unlocked(struct net_device *dev)hard_stop (dev); - *aup->enable =MAC_EN_CLOCK_ENABLE ; +writel (MAC_EN_CLOCK_ENABLE , &aup->enable);au_sync_delay (2 ); - *aup->enable =0 ; +writel (0 , &aup->enable);au_sync_delay (2 ); aup->tx_full =0 ;
@@ -1103,7 +1103,7 @@ static int __devinit au1000_probe(struct platform_device *pdev)memcpy (dev->dev_addr, au1000_mac_addr,sizeof (au1000_mac_addr)); dev->dev_addr[5 ] += pdev->id; - *aup->enable =0 ; +writel (0 , &aup->enable); aup->mac_enabled =0 ; pd = pdev->dev.platform_data;
Hi Florian,
Quoted 18 lines · Florian Fainelli
Hi David,
The next 3 patches apply to on top of the patch series that I sent earlier converting
au1000_ethto become aplatform_driver. Thanks !
--
From: Florian Fainelli <[email protected]>
This patch replaces all occurences of*aup->enable= val bywritel(val, &aup->enable)Signed-off-by Florian Fainelli <[email protected]>---
drivers/net/au1000_eth.c +0
-0@@ -155,10 +155,10 @@ static void enable_mac(struct net_device *dev, int force_reset) spin_lock_irqsave(&aup->lock, flags);
drivers/net/au1000_eth.c static void enable_mac(struct net_device *dev, int force_reset) · line 162
Quoted 10 lines
drivers/net/au1000_eth.c +3
-3if(force_reset || (!aup->mac_enabled)) { - *aup->enable = MAC_EN_CLOCK_ENABLE; + writel(MAC_EN_CLOCK_ENABLE, &aup->enable); au_sync_delay(2); - *aup->enable = (MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2 - | MAC_EN_CLOCK_ENABLE); + writel((MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2 + | MAC_EN_CLOCK_ENABLE), &aup->enable); au_sync_delay(2);
While you're at it, please also replace all "au_sync_delay()" with mmiowb() + msleep()
Thanks!
Manuel Lauss