diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-09-08 07:15:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-10 00:36:38 -0400 |
commit | d0e7cb5d401695809ba8c980124ab1d8c66efc8b (patch) | |
tree | ec2598de266cf3d9aa485d9f2f5e9b2b46e8bc4b /drivers/net/au1000_eth.h | |
parent | 49a42c080fbba9e99b4339763dd7771569ee38c3 (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.h | 10 |
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 @@ | |||
46 | */ | 46 | */ |
47 | struct db_dest { | 47 | struct db_dest { |
48 | struct db_dest *pnext; | 48 | struct db_dest *pnext; |
49 | volatile u32 *vaddr; | 49 | u32 *vaddr; |
50 | dma_addr_t dma_addr; | 50 | dma_addr_t dma_addr; |
51 | }; | 51 | }; |
52 | 52 | ||
@@ -88,8 +88,8 @@ struct mac_reg { | |||
88 | struct au1000_private { | 88 | struct au1000_private { |
89 | struct db_dest *pDBfree; | 89 | struct db_dest *pDBfree; |
90 | struct db_dest db[NUM_RX_BUFFS+NUM_TX_BUFFS]; | 90 | struct db_dest db[NUM_RX_BUFFS+NUM_TX_BUFFS]; |
91 | volatile struct rx_dma *rx_dma_ring[NUM_RX_DMA]; | 91 | struct rx_dma *rx_dma_ring[NUM_RX_DMA]; |
92 | volatile struct tx_dma *tx_dma_ring[NUM_TX_DMA]; | 92 | struct tx_dma *tx_dma_ring[NUM_TX_DMA]; |
93 | struct db_dest *rx_db_inuse[NUM_RX_DMA]; | 93 | struct db_dest *rx_db_inuse[NUM_RX_DMA]; |
94 | struct db_dest *tx_db_inuse[NUM_TX_DMA]; | 94 | struct db_dest *tx_db_inuse[NUM_TX_DMA]; |
95 | u32 rx_head; | 95 | u32 rx_head; |
@@ -120,8 +120,8 @@ struct au1000_private { | |||
120 | 120 | ||
121 | /* These variables are just for quick access | 121 | /* These variables are just for quick access |
122 | * to certain regs addresses. */ | 122 | * to certain regs addresses. */ |
123 | volatile struct mac_reg *mac; /* mac registers */ | 123 | struct mac_reg *mac; /* mac registers */ |
124 | volatile u32 *enable; /* address of MAC Enable Register */ | 124 | u32 *enable; /* address of MAC Enable Register */ |
125 | 125 | ||
126 | u32 vaddr; /* virtual address of rx/tx buffers */ | 126 | u32 vaddr; /* virtual address of rx/tx buffers */ |
127 | dma_addr_t dma_addr; /* dma address of rx/tx buffers */ | 127 | dma_addr_t dma_addr; /* dma address of rx/tx buffers */ |