sungem: PCI memory annotations

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 08a7c02556b47847e44b36529517eba1a6975e46..f657dbeb5cebd40d1823bc9791576bf39d4d409e 100644 (file)
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2656,7 +2656,7 @@ static void find_eth_addr_in_vpd(void *rom_base, int len, unsigned char *dev_add
 static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
 {
        u32 rom_reg_orig;
-       void *p;
+       void __iomem *p;
 
        if (pdev->resource[PCI_ROM_RESOURCE].parent == NULL) {
                if (pci_assign_resource(pdev, PCI_ROM_RESOURCE) < 0)
@@ -2825,7 +2825,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
        gp->timer_ticks = 0;
        netif_carrier_off(dev);
 
-       gp->regs = (unsigned long) ioremap(gemreg_base, gemreg_len);
+       gp->regs = ioremap(gemreg_base, gemreg_len);
        if (gp->regs == 0UL) {
                printk(KERN_ERR PFX "Cannot map device registers, "
                       "aborting.\n");
@@ -2944,7 +2944,7 @@ err_out_iounmap:
                gem_shutdown(gp);
        up(&gp->pm_sem);
 
-       iounmap((void *) gp->regs);
+       iounmap(gp->regs);
 
 err_out_free_res:
        pci_release_regions(pdev);
@@ -2978,7 +2978,7 @@ static void __devexit gem_remove_one(struct pci_dev *pdev)
                                    sizeof(struct gem_init_block),
                                    gp->init_block,
                                    gp->gblock_dvma);
-               iounmap((void *) gp->regs);
+               iounmap(gp->regs);
                pci_release_regions(pdev);
                free_netdev(dev);
 

diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index bc0175acb52e95b4fa2c0dafaece05dbe85ed9aa..8bbc104d848f0a1126341439badc29c6b7eb4f98 100644 (file)
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -953,7 +953,7 @@ enum link_state {
 
 struct gem {
        spinlock_t lock;
-       unsigned long regs;
+       void __iomem *regs;
        int rx_new, rx_old;
        int tx_new, tx_old;