Avoided unused variable warnings. redundancy
authorFlorian Pose <fp@igh-essen.com>
Mon, 09 Jan 2012 17:42:12 +0100
branchredundancy
changeset 2335 6c0d59f35642
parent 2334 e98faffe8650
child 2336 dc82f7d09767
Avoided unused variable warnings.
devices/e1000e/82571-2.6.37-ethercat.c
devices/e1000e/es2lan-2.6.37-ethercat.c
devices/e1000e/ich8lan-2.6.37-ethercat.c
devices/e1000e/netdev-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;
 
--- 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;
 
 	/*
--- 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;
 
 	/*
--- 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);