1 files changed, 11 insertions, 11 deletions

diff --git a/arch/sparc/kernel/leon_pci_grpci2.c b/arch/sparc/kernel/leon_pci_grpci2.c
index 24d6a4446349..e433a4d69fe0 100644
--- a/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/arch/sparc/kernel/leon_pci_grpci2.c
@@ -191,7 +191,7 @@ struct grpci2_cap_first {
 
 struct grpci2_priv {
         struct leon_pci_info    info; /* must be on top of this structure */
-        struct grpci2_regs      *regs;
+        struct grpci2_regs __iomem *regs;
         char                    irq;
         char                    irq_mode; /* IRQ Mode from CAPSTS REG */
         char                    bt_enabled;
@@ -215,10 +215,10 @@ struct grpci2_priv {
         struct grpci2_barcfg    tgtbars[6];
 };
 
-DEFINE_SPINLOCK(grpci2_dev_lock);
-struct grpci2_priv *grpci2priv;
+static DEFINE_SPINLOCK(grpci2_dev_lock);
+static struct grpci2_priv *grpci2priv;
 
-int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         struct grpci2_priv *priv = dev->bus->sysdata;
         int irq_group;
@@ -270,7 +270,7 @@ static int grpci2_cfg_r32(struct grpci2_priv *priv, unsigned int bus,
                 *val = 0xffffffff;
         } else {
                 /* Bus always little endian (unaffected by byte-swapping) */
-                *val = flip_dword(tmp);
+                *val = swab32(tmp);
         }
 
         return 0;
@@ -328,7 +328,7 @@ static int grpci2_cfg_w32(struct grpci2_priv *priv, unsigned int bus,
 
         pci_conf = (unsigned int *) (priv->pci_conf |
                                                 (devfn << 8) | (where & 0xfc));
-        LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));
+        LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));
 
         /* Wait until GRPCI2 signals that CFG access is done, it should be
          * done instantaneously unless a DMA operation is ongoing...
@@ -561,10 +561,10 @@ out:
         return virq;
 }
 
-void grpci2_hw_init(struct grpci2_priv *priv)
+static void grpci2_hw_init(struct grpci2_priv *priv)
 {
         u32 ahbadr, pciadr, bar_sz, capptr, io_map, data;
-        struct grpci2_regs *regs = priv->regs;
+        struct grpci2_regs __iomem *regs = priv->regs;
         int i;
         struct grpci2_barcfg *barcfg = priv->tgtbars;
 
@@ -655,7 +655,7 @@ static irqreturn_t grpci2_jump_interrupt(int irq, void *arg)
 static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
 {
         struct grpci2_priv *priv = arg;
-        struct grpci2_regs *regs = priv->regs;
+        struct grpci2_regs __iomem *regs = priv->regs;
         unsigned int status;
 
         status = REGLOAD(regs->sts_cap);
@@ -682,7 +682,7 @@ static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
 
 static int grpci2_of_probe(struct platform_device *ofdev)
 {
-        struct grpci2_regs *regs;
+        struct grpci2_regs __iomem *regs;
         struct grpci2_priv *priv;
         int err, i, len;
         const int *tmp;
@@ -878,7 +878,7 @@ err4:
         release_resource(&priv->info.mem_space);
 err3:
         err = -ENOMEM;
-        iounmap((void *)priv->pci_io_va);
+        iounmap((void __iomem *)priv->pci_io_va);
 err2:
         kfree(priv);
 err1: