diff options
author | Scott Wood <scottwood@freescale.com> | 2007-10-01 15:20:58 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:04 -0400 |
commit | 31a5bb04d59931eb4657826213a439d37d12d4a9 (patch) | |
tree | 865af87dcb382e4cf035c9ccf5bf3ea094f2a712 /drivers/net/fs_enet/fs_enet.h | |
parent | 2b5b3a604a672be1d41728ed9e448ca3c9c23242 (diff) |
fs_enet: sparse fixes
Mostly a bunch of __iomem annotations.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/fs_enet/fs_enet.h')
-rw-r--r-- | drivers/net/fs_enet/fs_enet.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h index 5a5c9d18df2e..baf6477165af 100644 --- a/drivers/net/fs_enet/fs_enet.h +++ b/drivers/net/fs_enet/fs_enet.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/commproc.h> | 15 | #include <asm/commproc.h> |
16 | 16 | ||
17 | struct fec_info { | 17 | struct fec_info { |
18 | fec_t *fecp; | 18 | fec_t __iomem *fecp; |
19 | u32 mii_speed; | 19 | u32 mii_speed; |
20 | }; | 20 | }; |
21 | #endif | 21 | #endif |
@@ -81,14 +81,14 @@ struct fs_enet_private { | |||
81 | const struct fs_ops *ops; | 81 | const struct fs_ops *ops; |
82 | int rx_ring, tx_ring; | 82 | int rx_ring, tx_ring; |
83 | dma_addr_t ring_mem_addr; | 83 | dma_addr_t ring_mem_addr; |
84 | void *ring_base; | 84 | void __iomem *ring_base; |
85 | struct sk_buff **rx_skbuff; | 85 | struct sk_buff **rx_skbuff; |
86 | struct sk_buff **tx_skbuff; | 86 | struct sk_buff **tx_skbuff; |
87 | cbd_t *rx_bd_base; /* Address of Rx and Tx buffers. */ | 87 | cbd_t __iomem *rx_bd_base; /* Address of Rx and Tx buffers. */ |
88 | cbd_t *tx_bd_base; | 88 | cbd_t __iomem *tx_bd_base; |
89 | cbd_t *dirty_tx; /* ring entries to be free()ed. */ | 89 | cbd_t __iomem *dirty_tx; /* ring entries to be free()ed. */ |
90 | cbd_t *cur_rx; | 90 | cbd_t __iomem *cur_rx; |
91 | cbd_t *cur_tx; | 91 | cbd_t __iomem *cur_tx; |
92 | int tx_free; | 92 | int tx_free; |
93 | struct net_device_stats stats; | 93 | struct net_device_stats stats; |
94 | struct timer_list phy_timer_list; | 94 | struct timer_list phy_timer_list; |
@@ -113,23 +113,23 @@ struct fs_enet_private { | |||
113 | union { | 113 | union { |
114 | struct { | 114 | struct { |
115 | int idx; /* FEC1 = 0, FEC2 = 1 */ | 115 | int idx; /* FEC1 = 0, FEC2 = 1 */ |
116 | void *fecp; /* hw registers */ | 116 | void __iomem *fecp; /* hw registers */ |
117 | u32 hthi, htlo; /* state for multicast */ | 117 | u32 hthi, htlo; /* state for multicast */ |
118 | } fec; | 118 | } fec; |
119 | 119 | ||
120 | struct { | 120 | struct { |
121 | int idx; /* FCC1-3 = 0-2 */ | 121 | int idx; /* FCC1-3 = 0-2 */ |
122 | void *fccp; /* hw registers */ | 122 | void __iomem *fccp; /* hw registers */ |
123 | void *ep; /* parameter ram */ | 123 | void __iomem *ep; /* parameter ram */ |
124 | void *fcccp; /* hw registers cont. */ | 124 | void __iomem *fcccp; /* hw registers cont. */ |
125 | void *mem; /* FCC DPRAM */ | 125 | void __iomem *mem; /* FCC DPRAM */ |
126 | u32 gaddrh, gaddrl; /* group address */ | 126 | u32 gaddrh, gaddrl; /* group address */ |
127 | } fcc; | 127 | } fcc; |
128 | 128 | ||
129 | struct { | 129 | struct { |
130 | int idx; /* FEC1 = 0, FEC2 = 1 */ | 130 | int idx; /* FEC1 = 0, FEC2 = 1 */ |
131 | void *sccp; /* hw registers */ | 131 | void __iomem *sccp; /* hw registers */ |
132 | void *ep; /* parameter ram */ | 132 | void __iomem *ep; /* parameter ram */ |
133 | u32 hthi, htlo; /* state for multicast */ | 133 | u32 hthi, htlo; /* state for multicast */ |
134 | } scc; | 134 | } scc; |
135 | 135 | ||
@@ -200,7 +200,7 @@ extern const struct fs_ops fs_scc_ops; | |||
200 | /*******************************************************************/ | 200 | /*******************************************************************/ |
201 | 201 | ||
202 | /* handy pointer to the immap */ | 202 | /* handy pointer to the immap */ |
203 | extern void *fs_enet_immap; | 203 | extern void __iomem *fs_enet_immap; |
204 | 204 | ||
205 | /*******************************************************************/ | 205 | /*******************************************************************/ |
206 | 206 | ||