e1000e: cleanup: remove e1000_get_cable_length()
authorBruce Allan <bruce.w.allan@intel.com>
Sat, 5 Jan 2013 08:06:24 +0000 (08:06 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 28 Jan 2013 06:28:55 +0000 (22:28 -0800)
Remove the function e1000_get_cable_length() and replace the two calls
to it with the same function pointer that it would call.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/phy.c

index 115656e1dc46c5606593ccb01e3781f77a1a8074..896eacc804333be64c31320bc707eb3d0944643d 100644 (file)
@@ -737,11 +737,6 @@ static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data)
        return hw->phy.ops.write_reg_locked(hw, offset, data);
 }
 
-static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
-{
-       return hw->phy.ops.get_cable_length(hw);
-}
-
 extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);
 extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
index 3cf627be97769cae68d0d30af50bb910d6983569..c4bfbd61d89560719092621b75c92fe01fa02a0e 100644 (file)
@@ -1960,7 +1960,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
        phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);
 
        if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-               ret_val = e1000_get_cable_length(hw);
+               ret_val = hw->phy.ops.get_cable_length(hw);
                if (ret_val)
                        return ret_val;
 
@@ -2024,7 +2024,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
 
        if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
            IGP01E1000_PSSR_SPEED_1000MBPS) {
-               ret_val = e1000_get_cable_length(hw);
+               ret_val = phy->ops.get_cable_length(hw);
                if (ret_val)
                        return ret_val;