From 3eb006c829be315cc183d436628db14faa6c4d99 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Sat, 5 Jan 2013 08:06:19 +0000
Subject: [PATCH] --- yaml --- r: 351703 b: refs/heads/master c:
 84c1befe341d71ed1b878afa28bb637a0b459161 h: refs/heads/master i:   351701:
 0a2a9caf5c5306ef0978135ff585f5e0f70db592   351699:
 7f8c0e0b1681a4852d60d3572644885ca6408a21   351695:
 8df50752b1eae75777dfe561536cb0775e1a9b52 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/ethernet/intel/e1000e/phy.c | 20 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 271c483adea9..b833218b9e0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe90849f76de7cd584e8c6c38b076cd366415994
+refs/heads/master: 84c1befe341d71ed1b878afa28bb637a0b459161
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/phy.c b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
index 37a85d4bb7d0..3cf627be9776 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
@@ -28,7 +28,6 @@
 
 #include "e1000.h"
 
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
 static s32 e1000_wait_autoneg(struct e1000_hw *hw);
 static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
 					  u16 *data, bool read, bool page_set);
@@ -2165,7 +2164,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
 
 	phy->ops.release(hw);
 
-	return e1000_get_phy_cfg_done(hw);
+	return phy->ops.get_cfg_done(hw);
 }
 
 /**
@@ -2265,23 +2264,6 @@ s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)
 	return 0;
 }
 
-/* Internal function pointers */
-
-/**
- *  e1000_get_phy_cfg_done - Generic PHY configuration done
- *  @hw: pointer to the HW structure
- *
- *  Return success if silicon family did not implement a family specific
- *  get_cfg_done function.
- **/
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
-{
-	if (hw->phy.ops.get_cfg_done)
-		return hw->phy.ops.get_cfg_done(hw);
-
-	return 0;
-}
-
 /**
  *  e1000e_get_phy_type_from_id - Get PHY type from id
  *  @phy_id: phy_id read from the phy