1 files changed, 7 insertions, 14 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 872799b746f5..dd8343244378 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -912,7 +912,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         u16 eeprom_data = 0;
         u16 eeprom_apme_mask = E1000_EEPROM_APME;
         int bars, need_ioport;
-        DECLARE_MAC_BUF(mac);
 
         /* do not allocate ioport bars when not needed */
         need_ioport = e1000_is_need_ioport(pdev);
@@ -967,8 +966,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         hw->back = adapter;
 
         err = -EIO;
-        hw->hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
-                              pci_resource_len(pdev, BAR_0));
+        hw->hw_addr = pci_ioremap_bar(pdev, BAR_0);
         if (!hw->hw_addr)
                 goto err_ioremap;
 
@@ -1016,9 +1014,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
          * because it depends on mac_type */
         if ((hw->mac_type == e1000_ich8lan) &&
            (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-                hw->flash_address =
-                        ioremap(pci_resource_start(pdev, 1),
-                                pci_resource_len(pdev, 1));
+                hw->flash_address = pci_ioremap_bar(pdev, 1);
                 if (!hw->flash_address)
                         goto err_flashmap;
         }
@@ -1195,7 +1191,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                  (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
                  "32-bit"));
 
-        printk("%s\n", print_mac(mac, netdev->dev_addr));
+        printk("%pM\n", netdev->dev_addr);
 
         if (hw->bus_type == e1000_bus_type_pci_express) {
                 DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
@@ -3791,8 +3787,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
         struct net_device *poll_dev = adapter->netdev;
         int tx_cleaned = 0, work_done = 0;
 
-        /* Must NOT use netdev_priv macro here. */
-        adapter = poll_dev->priv;
+        adapter = netdev_priv(poll_dev);
 
         /* e1000_clean is called per-cpu.  This lock protects
          * tx_ring[0] from being cleaned by multiple cpus
@@ -4104,8 +4099,6 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
                         netif_receive_skb(skb);
                 }
 
-                netdev->last_rx = jiffies;
-
 next_desc:
                 rx_desc->status = 0;
 
@@ -4789,7 +4782,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
                                                 pci_channel_state_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
 
         netif_device_detach(netdev);
 
@@ -4811,7 +4804,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
 static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         int err;
 
@@ -4845,7 +4838,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 static void e1000_io_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
         e1000_init_manageability(adapter);