summaryrefslogtreecommitdiff
path: root/drivers/net/au1000_eth.h
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-09-08 11:15:13 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-09 21:36:38 -0700
commitd0e7cb5d401695809ba8c980124ab1d8c66efc8b (patch)
treeec2598de266cf3d9aa485d9f2f5e9b2b46e8bc4b /drivers/net/au1000_eth.h
parent49a42c080fbba9e99b4339763dd7771569ee38c3 (diff)
au1000-eth: remove volatiles, switch to I/O accessors
Remove all the volatile keywords where they were used, switch to using the proper readl/writel accessors. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/au1000_eth.h')
-rw-r--r--drivers/net/au1000_eth.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h
index 38c1d8845ac6..4b638df22240 100644
--- a/drivers/net/au1000_eth.h
+++ b/drivers/net/au1000_eth.h
@@ -46,7 +46,7 @@
*/
struct db_dest {
struct db_dest *pnext;
- volatile u32 *vaddr;
+ u32 *vaddr;
dma_addr_t dma_addr;
};
@@ -88,8 +88,8 @@ struct mac_reg {
struct au1000_private {
struct db_dest *pDBfree;
struct db_dest db[NUM_RX_BUFFS+NUM_TX_BUFFS];
- volatile struct rx_dma *rx_dma_ring[NUM_RX_DMA];
- volatile struct tx_dma *tx_dma_ring[NUM_TX_DMA];
+ struct rx_dma *rx_dma_ring[NUM_RX_DMA];
+ struct tx_dma *tx_dma_ring[NUM_TX_DMA];
struct db_dest *rx_db_inuse[NUM_RX_DMA];
struct db_dest *tx_db_inuse[NUM_TX_DMA];
u32 rx_head;
@@ -120,8 +120,8 @@ struct au1000_private {
/* These variables are just for quick access
* to certain regs addresses. */
- volatile struct mac_reg *mac; /* mac registers */
- volatile u32 *enable; /* address of MAC Enable Register */
+ struct mac_reg *mac; /* mac registers */
+ u32 *enable; /* address of MAC Enable Register */
u32 vaddr; /* virtual address of rx/tx buffers */
dma_addr_t dma_addr; /* dma address of rx/tx buffers */