4 files changed, 102 insertions, 117 deletions

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index c73be2848319..cd5789ff3726 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -83,14 +83,17 @@
 #include "atl1.h"
 
 #define ATLX_DRIVER_VERSION "2.1.3"
-MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
-Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
+MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, "
+              "Chris Snook <csnook@redhat.com>, "
+              "Jay Cliburn <jcliburn@gmail.com>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(ATLX_DRIVER_VERSION);
 
 /* Temporary hack for merging atl1 and atl2 */
 #include "atlx.c"
 
+static const struct ethtool_ops atl1_ethtool_ops;
+
 /*
  * This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.
@@ -353,7 +356,7 @@ static bool atl1_read_eeprom(struct atl1_hw *hw, u32 offset, u32 *p_value)
  * hw - Struct containing variables accessed by shared code
  * reg_addr - address of the PHY register to read
  */
-s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
+static s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data)
 {
         u32 val;
         int i;
@@ -553,7 +556,7 @@ static s32 atl1_read_mac_addr(struct atl1_hw *hw)
  *          1. calcu 32bit CRC for multicast address
  *          2. reverse crc with MSB to LSB
  */
-u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr)
+static u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr)
 {
         u32 crc32, value = 0;
         int i;
@@ -570,7 +573,7 @@ u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr)
  * hw - Struct containing variables accessed by shared code
  * hash_value - Multicast address hash value
  */
-void atl1_hash_set(struct atl1_hw *hw, u32 hash_value)
+static void atl1_hash_set(struct atl1_hw *hw, u32 hash_value)
 {
         u32 hash_bit, hash_reg;
         u32 mta;
@@ -914,7 +917,7 @@ static s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex
         return 0;
 }
 
-void atl1_set_mac_addr(struct atl1_hw *hw)
+static void atl1_set_mac_addr(struct atl1_hw *hw)
 {
         u32 value;
         /*
@@ -948,6 +951,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
         hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
         adapter->wol = 0;
+        device_set_wakeup_enable(&adapter->pdev->dev, false);
         adapter->rx_buffer_len = (hw->max_frame_size + 7) & ~7;
         adapter->ict = 50000;           /* 100ms */
         adapter->link_speed = SPEED_0;  /* hardware init */
@@ -1811,7 +1815,7 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
          * the higher layers and let it be sorted out there.
          */
 
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 
         if (unlikely(rrd->pkt_flg & PACKET_FLAG_ERR)) {
                 if (rrd->err_flg & (ERR_FLAG_CRC | ERR_FLAG_TRUNC |
@@ -2071,9 +2075,6 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
         cmb_tpd_next_to_clean = le16_to_cpu(adapter->cmb.cmb->tpd_cons_idx);
 
         while (cmb_tpd_next_to_clean != sw_tpd_next_to_clean) {
-                struct tx_packet_desc *tpd;
-
-                tpd = ATL1_TPD_DESC(tpd_ring, sw_tpd_next_to_clean);
                 buffer_info = &tpd_ring->buffer_info[sw_tpd_next_to_clean];
                 if (buffer_info->dma) {
                         pci_unmap_page(adapter->pdev, buffer_info->dma,
@@ -2100,9 +2101,9 @@ static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)
 {
         u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
         u16 next_to_use = atomic_read(&tpd_ring->next_to_use);
-        return ((next_to_clean > next_to_use) ?
+        return (next_to_clean > next_to_use) ?
                 next_to_clean - next_to_use - 1 :
-                tpd_ring->count + next_to_clean - next_to_use - 1);
+                tpd_ring->count + next_to_clean - next_to_use - 1;
 }
 
 static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
@@ -2172,7 +2173,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
         u8 css, cso;
 
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
-                css = (u8) (skb->csum_start - skb_headroom(skb));
+                css = skb_checksum_start_offset(skb);
                 cso = css + (u8) skb->csum_offset;
                 if (unlikely(css & 0x1)) {
                         /* L1 hardware requires an even number here */
@@ -2408,7 +2409,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,
                 (u16) atomic_read(&tpd_ring->next_to_use));
         memset(ptpd, 0, sizeof(struct tx_packet_desc));
 
-        if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 vlan_tag = vlan_tx_tag_get(skb);
                 vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) |
                         ((vlan_tag >> 9) & 0x8);
@@ -2569,7 +2570,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         int err;
-        int irq_flags = IRQF_SAMPLE_RANDOM;
+        int irq_flags = 0;
 
         /* hardware has been reset, we need to reload some things */
         atlx_set_multi(netdev);
@@ -2733,15 +2734,15 @@ static int atl1_close(struct net_device *netdev)
 }
 
 #ifdef CONFIG_PM
-static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
+static int atl1_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
         struct atl1_hw *hw = &adapter->hw;
         u32 ctrl = 0;
         u32 wufc = adapter->wol;
         u32 val;
-        int retval;
         u16 speed;
         u16 duplex;
 
@@ -2749,17 +2750,15 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
         if (netif_running(netdev))
                 atl1_down(adapter);
 
-        retval = pci_save_state(pdev);
-        if (retval)
-                return retval;
-
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         val = ctrl & BMSR_LSTATUS;
         if (val)
                 wufc &= ~ATLX_WUFC_LNKC;
+        if (!wufc)
+                goto disable_wol;
 
-        if (val && wufc) {
+        if (val) {
                 val = atl1_get_speed_and_duplex(hw, &speed, &duplex);
                 if (val) {
                         if (netif_msg_ifdown(adapter))
@@ -2796,23 +2795,18 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
                 ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
                 iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
                 ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
-
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
-        }
-
-        if (!val && wufc) {
+        } else {
                 ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
                 iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
                 ioread32(hw->hw_addr + REG_WOL_CTRL);
                 iowrite32(0, hw->hw_addr + REG_MAC_CTRL);
                 ioread32(hw->hw_addr + REG_MAC_CTRL);
                 hw->phy_configured = false;
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
         }
 
-disable_wol:
+        return 0;
+
+ disable_wol:
         iowrite32(0, hw->hw_addr + REG_WOL_CTRL);
         ioread32(hw->hw_addr + REG_WOL_CTRL);
         ctrl = ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
@@ -2820,37 +2814,17 @@ disable_wol:
         iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
         ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
         hw->phy_configured = false;
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-exit:
-        if (netif_running(netdev))
-                pci_disable_msi(adapter->pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
 
-static int atl1_resume(struct pci_dev *pdev)
+static int atl1_resume(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
-        u32 err;
-
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-
-        err = pci_enable_device(pdev);
-        if (err) {
-                if (netif_msg_ifup(adapter))
-                        dev_printk(KERN_DEBUG, &pdev->dev,
-                                "error enabling pci device\n");
-                return err;
-        }
 
-        pci_set_master(pdev);
         iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
-        pci_enable_wake(pdev, PCI_D3hot, 0);
-        pci_enable_wake(pdev, PCI_D3cold, 0);
 
         atl1_reset_hw(&adapter->hw);
 
@@ -2862,16 +2836,25 @@ static int atl1_resume(struct pci_dev *pdev)
 
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
+#define ATL1_PM_OPS     (&atl1_pm_ops)
+
 #else
-#define atl1_suspend NULL
-#define atl1_resume NULL
+
+static int atl1_suspend(struct device *dev) { return 0; }
+
+#define ATL1_PM_OPS     NULL
 #endif
 
 static void atl1_shutdown(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PM
-        atl1_suspend(pdev, PMSG_SUSPEND);
-#endif
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+
+        atl1_suspend(&pdev->dev);
+        pci_wake_from_d3(pdev, adapter->wol);
+        pci_set_power_state(pdev, PCI_D3hot);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -3001,6 +2984,11 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->features |= NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
 
+        netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO;
+
+        /* is this valid? see atl1_setup_mac_ctrl() */
+        netdev->features |= NETIF_F_RXCSUM;
+
         /*
          * patch for some L1 of old version,
          * the final version of L1 may not need these
@@ -3041,9 +3029,8 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         atl1_pcie_patch(adapter);
         /* assume we have no link for now */
         netif_carrier_off(netdev);
-        netif_stop_queue(netdev);
 
-        setup_timer(&adapter->phy_config_timer, &atl1_phy_config,
+        setup_timer(&adapter->phy_config_timer, atl1_phy_config,
                     (unsigned long)adapter);
         adapter->phy_timer_pending = false;
 
@@ -3116,9 +3103,8 @@ static struct pci_driver atl1_driver = {
         .id_table = atl1_pci_tbl,
         .probe = atl1_probe,
         .remove = __devexit_p(atl1_remove),
-        .suspend = atl1_suspend,
-        .resume = atl1_resume,
-        .shutdown = atl1_shutdown
+        .shutdown = atl1_shutdown,
+        .driver.pm = ATL1_PM_OPS,
 };
 
 /*
@@ -3246,13 +3232,13 @@ static int atl1_get_settings(struct net_device *netdev,
         if (netif_carrier_ok(adapter->netdev)) {
                 u16 link_speed, link_duplex;
                 atl1_get_speed_and_duplex(hw, &link_speed, &link_duplex);
-                ecmd->speed = link_speed;
+                ethtool_cmd_speed_set(ecmd, link_speed);
                 if (link_duplex == FULL_DUPLEX)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
         if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR ||
@@ -3283,7 +3269,8 @@ static int atl1_set_settings(struct net_device *netdev,
         if (ecmd->autoneg == AUTONEG_ENABLE)
                 hw->media_type = MEDIA_TYPE_AUTO_SENSOR;
         else {
-                if (ecmd->speed == SPEED_1000) {
+                u32 speed = ethtool_cmd_speed(ecmd);
+                if (speed == SPEED_1000) {
                         if (ecmd->duplex != DUPLEX_FULL) {
                                 if (netif_msg_link(adapter))
                                         dev_warn(&adapter->pdev->dev,
@@ -3292,7 +3279,7 @@ static int atl1_set_settings(struct net_device *netdev,
                                 goto exit_sset;
                         }
                         hw->media_type = MEDIA_TYPE_1000M_FULL;
-                } else if (ecmd->speed == SPEED_100) {
+                } else if (speed == SPEED_100) {
                         if (ecmd->duplex == DUPLEX_FULL)
                                 hw->media_type = MEDIA_TYPE_100M_FULL;
                         else
@@ -3408,6 +3395,9 @@ static int atl1_set_wol(struct net_device *netdev,
         adapter->wol = 0;
         if (wol->wolopts & WAKE_MAGIC)
                 adapter->wol |= ATLX_WUFC_MAG;
+
+        device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
         return 0;
 }
 
@@ -3503,6 +3493,8 @@ static int atl1_set_ringparam(struct net_device *netdev,
         struct atl1_rfd_ring rfd_old, rfd_new;
         struct atl1_rrd_ring rrd_old, rrd_new;
         struct atl1_ring_header rhdr_old, rhdr_new;
+        struct atl1_smb smb;
+        struct atl1_cmb cmb;
         int err;
 
         tpd_old = adapter->tpd_ring;
@@ -3543,11 +3535,19 @@ static int atl1_set_ringparam(struct net_device *netdev,
                 adapter->rrd_ring = rrd_old;
                 adapter->tpd_ring = tpd_old;
                 adapter->ring_header = rhdr_old;
+                /*
+                 * Save SMB and CMB, since atl1_free_ring_resources
+                 * will clear them.
+                 */
+                smb = adapter->smb;
+                cmb = adapter->cmb;
                 atl1_free_ring_resources(adapter);
                 adapter->rfd_ring = rfd_new;
                 adapter->rrd_ring = rrd_new;
                 adapter->tpd_ring = tpd_new;
                 adapter->ring_header = rhdr_new;
+                adapter->smb = smb;
+                adapter->cmb = cmb;
 
                 err = atl1_up(adapter);
                 if (err)
@@ -3599,12 +3599,6 @@ static int atl1_set_pauseparam(struct net_device *netdev,
         return 0;
 }
 
-/* FIXME: is this right? -- CHS */
-static u32 atl1_get_rx_csum(struct net_device *netdev)
-{
-        return 1;
-}
-
 static void atl1_get_strings(struct net_device *netdev, u32 stringset,
         u8 *data)
 {
@@ -3658,7 +3652,7 @@ static int atl1_nway_reset(struct net_device *netdev)
         return 0;
 }
 
-const struct ethtool_ops atl1_ethtool_ops = {
+static const struct ethtool_ops atl1_ethtool_ops = {
         .get_settings           = atl1_get_settings,
         .set_settings           = atl1_set_settings,
         .get_drvinfo            = atl1_get_drvinfo,
@@ -3672,13 +3666,9 @@ const struct ethtool_ops atl1_ethtool_ops = {
         .set_ringparam          = atl1_set_ringparam,
         .get_pauseparam         = atl1_get_pauseparam,
         .set_pauseparam         = atl1_set_pauseparam,
-        .get_rx_csum            = atl1_get_rx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_hw_csum,
         .get_link               = ethtool_op_get_link,
-        .set_sg                 = ethtool_op_set_sg,
         .get_strings            = atl1_get_strings,
         .nway_reset             = atl1_nway_reset,
         .get_ethtool_stats      = atl1_get_ethtool_stats,
         .get_sset_count         = atl1_get_sset_count,
-        .set_tso                = ethtool_op_set_tso,
 };
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index 9c0ddb273ac8..68de8cbfb3ec 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -56,16 +56,13 @@ struct atl1_adapter;
 struct atl1_hw;
 
 /* function prototypes needed by multiple files */
-u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
-void atl1_hash_set(struct atl1_hw *hw, u32 hash_value);
-s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data);
-void atl1_set_mac_addr(struct atl1_hw *hw);
+static u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
+static void atl1_hash_set(struct atl1_hw *hw, u32 hash_value);
+static void atl1_set_mac_addr(struct atl1_hw *hw);
 static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
         int cmd);
 static u32 atl1_check_link(struct atl1_adapter *adapter);
 
-extern const struct ethtool_ops atl1_ethtool_ops;
-
 /* hardware definitions specific to L1 */
 
 /* Block IDLE Status Register */
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 8da87383fb39..16249e9b6b95 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -51,10 +51,10 @@
 
 #define ATL2_DRV_VERSION "2.2.3"
 
-static char atl2_driver_name[] = "atl2";
+static const char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
-static char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
-static char atl2_driver_version[] = ATL2_DRV_VERSION;
+static const char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
+static const char atl2_driver_version[] = ATL2_DRV_VERSION;
 
 MODULE_AUTHOR("Atheros Corporation <xiong.huang@atheros.com>, Chris Snook <csnook@redhat.com>");
 MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");
@@ -93,8 +93,8 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
+        hw->revision_id  = pdev->revision;
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
         pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
 
         adapter->wol = 0;
@@ -870,7 +870,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
                 offset = ((u32)(skb->len-copy_len + 3) & ~3);
         }
 #ifdef NETIF_F_HW_VLAN_TX
-        if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 u16 vlan_tag = vlan_tx_tag_get(skb);
                 vlan_tag = (vlan_tag << 4) |
                         (vlan_tag >> 13) |
@@ -1411,9 +1411,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
 
         err = -EIO;
 
-#ifdef NETIF_F_HW_VLAN_TX
+        netdev->hw_features = NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-#endif
 
         /* Init PHY as early as possible due to power saving issue  */
         atl2_phy_init(&adapter->hw);
@@ -1444,11 +1443,11 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
         atl2_check_options(adapter);
 
         init_timer(&adapter->watchdog_timer);
-        adapter->watchdog_timer.function = &atl2_watchdog;
+        adapter->watchdog_timer.function = atl2_watchdog;
         adapter->watchdog_timer.data = (unsigned long) adapter;
 
         init_timer(&adapter->phy_config_timer);
-        adapter->phy_config_timer.function = &atl2_phy_config;
+        adapter->phy_config_timer.function = atl2_phy_config;
         adapter->phy_config_timer.data = (unsigned long) adapter;
 
         INIT_WORK(&adapter->reset_task, atl2_reset_task);
@@ -1504,8 +1503,8 @@ static void __devexit atl2_remove(struct pci_dev *pdev)
 
         del_timer_sync(&adapter->watchdog_timer);
         del_timer_sync(&adapter->phy_config_timer);
-
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
+        cancel_work_sync(&adapter->link_chg_task);
 
         unregister_netdev(netdev);
 
@@ -1701,7 +1700,7 @@ static struct pci_driver atl2_driver = {
         .id_table = atl2_pci_tbl,
         .probe    = atl2_probe,
         .remove   = __devexit_p(atl2_remove),
-        /* Power Managment Hooks */
+        /* Power Management Hooks */
         .suspend  = atl2_suspend,
 #ifdef CONFIG_PM
         .resume   = atl2_resume,
@@ -1770,13 +1769,13 @@ static int atl2_get_settings(struct net_device *netdev,
         ecmd->transceiver = XCVR_INTERNAL;
 
         if (adapter->link_speed != SPEED_0) {
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 if (adapter->link_duplex == FULL_DUPLEX)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -1840,11 +1839,6 @@ static int atl2_set_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 atl2_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
 static u32 atl2_get_msglevel(struct net_device *netdev)
 {
         return 0;
@@ -1996,13 +1990,15 @@ static int atl2_set_eeprom(struct net_device *netdev,
         if (!eeprom_buff)
                 return -ENOMEM;
 
-        ptr = (u32 *)eeprom_buff;
+        ptr = eeprom_buff;
 
         if (eeprom->offset & 3) {
                 /* need read/modify/write of first changed EEPROM word */
                 /* only the second byte of the word is being modified */
-                if (!atl2_read_eeprom(hw, first_dword*4, &(eeprom_buff[0])))
-                        return -EIO;
+                if (!atl2_read_eeprom(hw, first_dword*4, &(eeprom_buff[0]))) {
+                        ret_val = -EIO;
+                        goto out;
+                }
                 ptr++;
         }
         if (((eeprom->offset + eeprom->len) & 3)) {
@@ -2011,18 +2007,22 @@ static int atl2_set_eeprom(struct net_device *netdev,
                  * only the first byte of the word is being modified
                  */
                 if (!atl2_read_eeprom(hw, last_dword * 4,
-                        &(eeprom_buff[last_dword - first_dword])))
-                        return -EIO;
+                                        &(eeprom_buff[last_dword - first_dword]))) {
+                        ret_val = -EIO;
+                        goto out;
+                }
         }
 
         /* Device's eeprom is always little-endian, word addressable */
         memcpy(ptr, bytes, eeprom->len);
 
         for (i = 0; i < last_dword - first_dword + 1; i++) {
-                if (!atl2_write_eeprom(hw, ((first_dword+i)*4), eeprom_buff[i]))
-                        return -EIO;
+                if (!atl2_write_eeprom(hw, ((first_dword+i)*4), eeprom_buff[i])) {
+                        ret_val = -EIO;
+                        goto out;
+                }
         }
-
+ out:
         kfree(eeprom_buff);
         return ret_val;
 }
@@ -2106,12 +2106,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
         .get_eeprom_len         = atl2_get_eeprom_len,
         .get_eeprom             = atl2_get_eeprom,
         .set_eeprom             = atl2_set_eeprom,
-        .get_tx_csum            = atl2_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
-        .get_tso                = ethtool_op_get_tso,
-#endif
 };
 
 static void atl2_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
index f979ea2d6d3c..afb7f7dd1bb1 100644
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
@@ -41,6 +41,10 @@
 
 #include "atlx.h"
 
+static s32 atlx_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data);
+static u32 atlx_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
+static void atlx_set_mac_addr(struct atl1_hw *hw);
+
 static struct atlx_spi_flash_dev flash_table[] = {
 /*      MFR_NAME  WRSR  READ  PRGM  WREN  WRDI  RDSR  RDID  SEC_ERS CHIP_ERS */
         {"Atmel", 0x00, 0x03, 0x02, 0x06, 0x04, 0x05, 0x15, 0x52,   0x62},