1 files changed, 14 insertions, 22 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 3f67a42e8503..de399563a9db 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2817,7 +2817,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 #if (!defined(__sparc__) && !defined(CONFIG_PPC_PMAC))
 /* Fetch MAC address from vital product data of PCI ROM. */
-static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr)
+static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr)
 {
         int this_offset;
 
@@ -2838,35 +2838,27 @@ static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char
 
                 for (i = 0; i < 6; i++)
                         dev_addr[i] = readb(p + i);
-                break;
+                return 1;
         }
+        return 0;
 }
 
 static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
 {
-        u32 rom_reg_orig;
-        void __iomem *p;
-
-        if (pdev->resource[PCI_ROM_RESOURCE].parent == NULL) {
-                if (pci_assign_resource(pdev, PCI_ROM_RESOURCE) < 0)
-                        goto use_random;
-        }
+        size_t size;
+        void __iomem *p = pci_map_rom(pdev, &size);
 
-        pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_reg_orig);
-        pci_write_config_dword(pdev, pdev->rom_base_reg,
-                               rom_reg_orig | PCI_ROM_ADDRESS_ENABLE);
+        if (p) {
+                        int found;
 
-        p = ioremap(pci_resource_start(pdev, PCI_ROM_RESOURCE), (64 * 1024));
-        if (p != NULL && readb(p) == 0x55 && readb(p + 1) == 0xaa)
-                find_eth_addr_in_vpd(p, (64 * 1024), dev_addr);
-
-        if (p != NULL)
-                iounmap(p);
-
-        pci_write_config_dword(pdev, pdev->rom_base_reg, rom_reg_orig);
-        return;
+                found = readb(p) == 0x55 &&
+                        readb(p + 1) == 0xaa &&
+                        find_eth_addr_in_vpd(p, (64 * 1024), dev_addr);
+                pci_unmap_rom(pdev, p);
+                if (found)
+                        return;
+        }
 
-use_random:
         /* Sun MAC prefix then 3 random bytes. */
         dev_addr[0] = 0x08;
         dev_addr[1] = 0x00;