# HG changeset patch # User Florian Pose # Date 1326127332 -3600 # Node ID 18f9c69d959061845fe045841b8b09be06288114 # Parent 33accbe40987f427c3af3df1f8806ce6d24b8900 Avoided unused variable warnings. diff -r 33accbe40987 -r 18f9c69d9590 devices/e1000e/82571-2.6.37-ethercat.c --- a/devices/e1000e/82571-2.6.37-ethercat.c Mon Jan 09 17:42:01 2012 +0100 +++ b/devices/e1000e/82571-2.6.37-ethercat.c Mon Jan 09 17:42:12 2012 +0100 @@ -82,7 +82,7 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw) { struct e1000_phy_info *phy = &hw->phy; - s32 ret_val; + s32 ret_val __attribute__ ((unused)); if (hw->phy.media_type != e1000_media_type_copper) { phy->type = e1000_phy_none; @@ -853,7 +853,7 @@ **/ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) { - u32 ctrl, extcnf_ctrl, ctrl_ext, icr; + u32 ctrl, extcnf_ctrl, ctrl_ext, icr __attribute__ ((unused)); s32 ret_val; u16 i = 0; diff -r 33accbe40987 -r 18f9c69d9590 devices/e1000e/es2lan-2.6.37-ethercat.c --- a/devices/e1000e/es2lan-2.6.37-ethercat.c Mon Jan 09 17:42:01 2012 +0100 +++ b/devices/e1000e/es2lan-2.6.37-ethercat.c Mon Jan 09 17:42:12 2012 +0100 @@ -784,7 +784,7 @@ **/ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) { - u32 ctrl, icr; + u32 ctrl, icr __attribute__ ((unused)); s32 ret_val; /* diff -r 33accbe40987 -r 18f9c69d9590 devices/e1000e/ich8lan-2.6.37-ethercat.c --- a/devices/e1000e/ich8lan-2.6.37-ethercat.c Mon Jan 09 17:42:01 2012 +0100 +++ b/devices/e1000e/ich8lan-2.6.37-ethercat.c Mon Jan 09 17:42:12 2012 +0100 @@ -2978,7 +2978,7 @@ { struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan; u16 reg; - u32 ctrl, icr, kab; + u32 ctrl, icr __attribute__ ((unused)), kab; s32 ret_val; /* diff -r 33accbe40987 -r 18f9c69d9590 devices/e1000e/netdev-2.6.37-ethercat.c --- a/devices/e1000e/netdev-2.6.37-ethercat.c Mon Jan 09 17:42:01 2012 +0100 +++ b/devices/e1000e/netdev-2.6.37-ethercat.c Mon Jan 09 17:42:12 2012 +0100 @@ -2790,7 +2790,7 @@ /* Workaround Si errata on 82579 - configure jumbo frame flow */ if (hw->mac.type == e1000_pch2lan) { - s32 ret_val; + s32 ret_val __attribute__ ((unused)); if (adapter->netdev->mtu > ETH_DATA_LEN) ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);