Avoided unused variable warnings. redundancy
authorFlorian Pose <fp@igh-essen.com>
Mon, 09 Jan 2012 17:42:01 +0100
branchredundancy
changeset 2334 e98faffe8650
parent 2333 b9edca47250f
child 2335 6c0d59f35642
Avoided unused variable warnings.
devices/e1000/e1000_hw-2.6.37-ethercat.c
devices/e1000/e1000_main-2.6.37-ethercat.c
--- a/devices/e1000/e1000_hw-2.6.37-ethercat.c	Mon Jan 09 17:41:52 2012 +0100
+++ b/devices/e1000/e1000_hw-2.6.37-ethercat.c	Mon Jan 09 17:42:01 2012 +0100
@@ -149,7 +149,7 @@
  */
 static void e1000_phy_init_script(struct e1000_hw *hw)
 {
-	u32 ret_val;
+	u32 ret_val __attribute__ ((unused));
 	u16 phy_saved_data;
 
 	e_dbg("e1000_phy_init_script");
@@ -396,7 +396,7 @@
 {
 	u32 ctrl;
 	u32 ctrl_ext;
-	u32 icr;
+	u32 icr __attribute__ ((unused));
 	u32 manc;
 	u32 led_ctrl;
 	s32 ret_val;
@@ -2302,12 +2302,12 @@
  */
 s32 e1000_check_for_link(struct e1000_hw *hw)
 {
-	u32 rxcw = 0;
-	u32 ctrl;
+	u32 rxcw __attribute__ ((unused)) = 0;
+	u32 ctrl __attribute__ ((unused));
 	u32 status;
 	u32 rctl;
 	u32 icr;
-	u32 signal = 0;
+	u32 signal __attribute__ ((unused)) = 0;
 	s32 ret_val;
 	u16 phy_data;
 
@@ -4539,7 +4539,7 @@
  */
 static void e1000_clear_hw_cntrs(struct e1000_hw *hw)
 {
-	volatile u32 temp;
+	volatile u32 temp __attribute__ ((unused));
 
 	temp = er32(CRCERRS);
 	temp = er32(SYMERRS);
--- a/devices/e1000/e1000_main-2.6.37-ethercat.c	Mon Jan 09 17:41:52 2012 +0100
+++ b/devices/e1000/e1000_main-2.6.37-ethercat.c	Mon Jan 09 17:42:01 2012 +0100
@@ -2435,7 +2435,7 @@
 		if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
 				|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
 			u32 ctrl;
-			bool txb2b = true;
+			bool txb2b __attribute__ ((unused)) = true;
 			/* update snapshot of PHY registers on LSC */
 			e1000_get_speed_and_duplex(hw,
 			                           &adapter->link_speed,