net: pch_gbe: Remove power_{up,down}_phy HAL abstraction

[sfrench/cifs-2.6.git] / drivers / net / ethernet / oki-semi / pch_gbe / pch_gbe_main.c

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 044a7561752c9b0bd9805bd4e9369e2f49263e79..13fc828c7fd3db8d25d06a9ef07d17094464e776 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -2072,7 +2072,7 @@ static int pch_gbe_open(struct net_device *netdev)
        err = pch_gbe_setup_rx_resources(adapter, adapter->rx_ring);
        if (err)
                goto err_setup_rx;
-       pch_gbe_hal_power_up_phy(hw);
+       pch_gbe_phy_power_up(hw);
        err = pch_gbe_up(adapter);
        if (err)
                goto err_up;
@@ -2081,7 +2081,7 @@ static int pch_gbe_open(struct net_device *netdev)
 
 err_up:
        if (!adapter->wake_up_evt)
-               pch_gbe_hal_power_down_phy(hw);
+               pch_gbe_phy_power_down(hw);
        pch_gbe_free_rx_resources(adapter, adapter->rx_ring);
 err_setup_rx:
        pch_gbe_free_tx_resources(adapter, adapter->tx_ring);
@@ -2104,7 +2104,7 @@ static int pch_gbe_stop(struct net_device *netdev)
 
        pch_gbe_down(adapter);
        if (!adapter->wake_up_evt)
-               pch_gbe_hal_power_down_phy(hw);
+               pch_gbe_phy_power_down(hw);
        pch_gbe_free_tx_resources(adapter, adapter->tx_ring);
        pch_gbe_free_rx_resources(adapter, adapter->rx_ring);
        return 0;
@@ -2434,7 +2434,7 @@ static pci_ers_result_t pch_gbe_io_slot_reset(struct pci_dev *pdev)
        }
        pci_set_master(pdev);
        pci_enable_wake(pdev, PCI_D0, 0);
-       pch_gbe_hal_power_up_phy(hw);
+       pch_gbe_phy_power_up(hw);
        pch_gbe_reset(adapter);
        /* Clear wake up status */
        pch_gbe_mac_set_wol_event(hw, 0);
@@ -2479,7 +2479,7 @@ static int __pch_gbe_suspend(struct pci_dev *pdev)
                pch_gbe_mac_set_wol_event(hw, wufc);
                pci_disable_device(pdev);
        } else {
-               pch_gbe_hal_power_down_phy(hw);
+               pch_gbe_phy_power_down(hw);
                pch_gbe_mac_set_wol_event(hw, wufc);
                pci_disable_device(pdev);
        }
@@ -2508,7 +2508,7 @@ static int pch_gbe_resume(struct device *device)
                return err;
        }
        pci_set_master(pdev);
-       pch_gbe_hal_power_up_phy(hw);
+       pch_gbe_phy_power_up(hw);
        pch_gbe_reset(adapter);
        /* Clear wake on lan control and status */
        pch_gbe_mac_set_wol_event(hw, 0);