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-main.c | |
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-main.c')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index fc4fda805d44..04c6faec88d2 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -60,7 +60,7 @@ MODULE_DESCRIPTION("Freescale Ethernet Driver"); | |||
60 | MODULE_LICENSE("GPL"); | 60 | MODULE_LICENSE("GPL"); |
61 | MODULE_VERSION(DRV_MODULE_VERSION); | 61 | MODULE_VERSION(DRV_MODULE_VERSION); |
62 | 62 | ||
63 | int fs_enet_debug = -1; /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */ | 63 | static int fs_enet_debug = -1; /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */ |
64 | module_param(fs_enet_debug, int, 0); | 64 | module_param(fs_enet_debug, int, 0); |
65 | MODULE_PARM_DESC(fs_enet_debug, | 65 | MODULE_PARM_DESC(fs_enet_debug, |
66 | "Freescale bitmapped debugging message enable value"); | 66 | "Freescale bitmapped debugging message enable value"); |
@@ -90,7 +90,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget) | |||
90 | struct fs_enet_private *fep = container_of(napi, struct fs_enet_private, napi); | 90 | struct fs_enet_private *fep = container_of(napi, struct fs_enet_private, napi); |
91 | struct net_device *dev = to_net_dev(fep->dev); | 91 | struct net_device *dev = to_net_dev(fep->dev); |
92 | const struct fs_platform_info *fpi = fep->fpi; | 92 | const struct fs_platform_info *fpi = fep->fpi; |
93 | cbd_t *bdp; | 93 | cbd_t __iomem *bdp; |
94 | struct sk_buff *skb, *skbn, *skbt; | 94 | struct sk_buff *skb, *skbn, *skbt; |
95 | int received = 0; | 95 | int received = 0; |
96 | u16 pkt_len, sc; | 96 | u16 pkt_len, sc; |
@@ -230,7 +230,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev) | |||
230 | { | 230 | { |
231 | struct fs_enet_private *fep = netdev_priv(dev); | 231 | struct fs_enet_private *fep = netdev_priv(dev); |
232 | const struct fs_platform_info *fpi = fep->fpi; | 232 | const struct fs_platform_info *fpi = fep->fpi; |
233 | cbd_t *bdp; | 233 | cbd_t __iomem *bdp; |
234 | struct sk_buff *skb, *skbn, *skbt; | 234 | struct sk_buff *skb, *skbn, *skbt; |
235 | int received = 0; | 235 | int received = 0; |
236 | u16 pkt_len, sc; | 236 | u16 pkt_len, sc; |
@@ -355,7 +355,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev) | |||
355 | static void fs_enet_tx(struct net_device *dev) | 355 | static void fs_enet_tx(struct net_device *dev) |
356 | { | 356 | { |
357 | struct fs_enet_private *fep = netdev_priv(dev); | 357 | struct fs_enet_private *fep = netdev_priv(dev); |
358 | cbd_t *bdp; | 358 | cbd_t __iomem *bdp; |
359 | struct sk_buff *skb; | 359 | struct sk_buff *skb; |
360 | int dirtyidx, do_wake, do_restart; | 360 | int dirtyidx, do_wake, do_restart; |
361 | u16 sc; | 361 | u16 sc; |
@@ -503,7 +503,7 @@ fs_enet_interrupt(int irq, void *dev_id) | |||
503 | void fs_init_bds(struct net_device *dev) | 503 | void fs_init_bds(struct net_device *dev) |
504 | { | 504 | { |
505 | struct fs_enet_private *fep = netdev_priv(dev); | 505 | struct fs_enet_private *fep = netdev_priv(dev); |
506 | cbd_t *bdp; | 506 | cbd_t __iomem *bdp; |
507 | struct sk_buff *skb; | 507 | struct sk_buff *skb; |
508 | int i; | 508 | int i; |
509 | 509 | ||
@@ -557,7 +557,7 @@ void fs_cleanup_bds(struct net_device *dev) | |||
557 | { | 557 | { |
558 | struct fs_enet_private *fep = netdev_priv(dev); | 558 | struct fs_enet_private *fep = netdev_priv(dev); |
559 | struct sk_buff *skb; | 559 | struct sk_buff *skb; |
560 | cbd_t *bdp; | 560 | cbd_t __iomem *bdp; |
561 | int i; | 561 | int i; |
562 | 562 | ||
563 | /* | 563 | /* |
@@ -598,7 +598,7 @@ void fs_cleanup_bds(struct net_device *dev) | |||
598 | static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) | 598 | static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
599 | { | 599 | { |
600 | struct fs_enet_private *fep = netdev_priv(dev); | 600 | struct fs_enet_private *fep = netdev_priv(dev); |
601 | cbd_t *bdp; | 601 | cbd_t __iomem *bdp; |
602 | int curidx; | 602 | int curidx; |
603 | u16 sc; | 603 | u16 sc; |
604 | unsigned long flags; | 604 | unsigned long flags; |
@@ -1121,7 +1121,7 @@ static int fs_cleanup_instance(struct net_device *ndev) | |||
1121 | unregister_netdev(ndev); | 1121 | unregister_netdev(ndev); |
1122 | 1122 | ||
1123 | dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t), | 1123 | dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t), |
1124 | fep->ring_base, fep->ring_mem_addr); | 1124 | (void __force *)fep->ring_base, fep->ring_mem_addr); |
1125 | 1125 | ||
1126 | /* reset it */ | 1126 | /* reset it */ |
1127 | (*fep->ops->cleanup_data)(ndev); | 1127 | (*fep->ops->cleanup_data)(ndev); |
@@ -1141,7 +1141,7 @@ static int fs_cleanup_instance(struct net_device *ndev) | |||
1141 | /**************************************************************************************/ | 1141 | /**************************************************************************************/ |
1142 | 1142 | ||
1143 | /* handy pointer to the immap */ | 1143 | /* handy pointer to the immap */ |
1144 | void *fs_enet_immap = NULL; | 1144 | void __iomem *fs_enet_immap = NULL; |
1145 | 1145 | ||
1146 | static int setup_immap(void) | 1146 | static int setup_immap(void) |
1147 | { | 1147 | { |