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");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
 
-int fs_enet_debug = -1;         /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */
+static int fs_enet_debug = -1; /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */
 module_param(fs_enet_debug, int, 0);
 MODULE_PARM_DESC(fs_enet_debug,
                  "Freescale bitmapped debugging message enable value");
@@ -90,7 +90,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
         struct fs_enet_private *fep = container_of(napi, struct fs_enet_private, napi);
         struct net_device *dev = to_net_dev(fep->dev);
         const struct fs_platform_info *fpi = fep->fpi;
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         struct sk_buff *skb, *skbn, *skbt;
         int received = 0;
         u16 pkt_len, sc;
@@ -230,7 +230,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
         const struct fs_platform_info *fpi = fep->fpi;
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         struct sk_buff *skb, *skbn, *skbt;
         int received = 0;
         u16 pkt_len, sc;
@@ -355,7 +355,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
 static void fs_enet_tx(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         struct sk_buff *skb;
         int dirtyidx, do_wake, do_restart;
         u16 sc;
@@ -503,7 +503,7 @@ fs_enet_interrupt(int irq, void *dev_id)
 void fs_init_bds(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         struct sk_buff *skb;
         int i;
 
@@ -557,7 +557,7 @@ void fs_cleanup_bds(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
         struct sk_buff *skb;
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         int i;
 
         /*
@@ -598,7 +598,7 @@ void fs_cleanup_bds(struct net_device *dev)
 static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        cbd_t *bdp;
+        cbd_t __iomem *bdp;
         int curidx;
         u16 sc;
         unsigned long flags;
@@ -1121,7 +1121,7 @@ static int fs_cleanup_instance(struct net_device *ndev)
         unregister_netdev(ndev);
 
         dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t),
-                          fep->ring_base, fep->ring_mem_addr);
+                          (void __force *)fep->ring_base, fep->ring_mem_addr);
 
         /* reset it */
         (*fep->ops->cleanup_data)(ndev);
@@ -1141,7 +1141,7 @@ static int fs_cleanup_instance(struct net_device *ndev)
 /**************************************************************************************/
 
 /* handy pointer to the immap */
-void *fs_enet_immap = NULL;
+void __iomem *fs_enet_immap = NULL;
 
 static int setup_immap(void)
 {