1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7c5b05a82f0e..d4ee8ec34b56 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -926,8 +926,6 @@ e1000_probe(struct pci_dev *pdev,
 {
         struct net_device *netdev;
         struct e1000_adapter *adapter;
-        unsigned long mmio_start, mmio_len;
-        unsigned long flash_start, flash_len;
 
         static int cards_found = 0;
         static int global_quad_port_a = 0; /* global ksp3 port a indication */
@@ -970,11 +968,9 @@ e1000_probe(struct pci_dev *pdev,
         adapter->hw.back = adapter;
         adapter->msg_enable = (1 << debug) - 1;
 
-        mmio_start = pci_resource_start(pdev, BAR_0);
-        mmio_len = pci_resource_len(pdev, BAR_0);
-
         err = -EIO;
-        adapter->hw.hw_addr = ioremap(mmio_start, mmio_len);
+        adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
+                                      pci_resource_len(pdev, BAR_0));
         if (!adapter->hw.hw_addr)
                 goto err_ioremap;
 
@@ -1009,10 +1005,6 @@ e1000_probe(struct pci_dev *pdev,
 #endif
         strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
-        netdev->mem_start = mmio_start;
-        netdev->mem_end = mmio_start + mmio_len;
-        netdev->base_addr = adapter->hw.io_base;
-
         adapter->bd_number = cards_found;
 
         /* setup the private structure */
@@ -1025,9 +1017,9 @@ e1000_probe(struct pci_dev *pdev,
          * because it depends on mac_type */
         if ((adapter->hw.mac_type == e1000_ich8lan) &&
            (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-                flash_start = pci_resource_start(pdev, 1);
-                flash_len = pci_resource_len(pdev, 1);
-                adapter->hw.flash_address = ioremap(flash_start, flash_len);
+                adapter->hw.flash_address =
+                        ioremap(pci_resource_start(pdev, 1),
+                                pci_resource_len(pdev, 1));
                 if (!adapter->hw.flash_address)
                         goto err_flashmap;
         }