Browse Source

i40e: whitespace fixes

Fix more whitespace issues, including making some locals declared
in a nicer order.

Also update Copyright string printed when the driver loads.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jesse Brandeburg 11 years ago
parent
commit
8fb905b345

+ 1 - 1
drivers/net/ethernet/intel/i40e/i40e_common.c

@@ -1557,8 +1557,8 @@ i40e_status i40e_aq_discover_capabilities(struct i40e_hw *hw,
 				struct i40e_asq_cmd_details *cmd_details)
 				struct i40e_asq_cmd_details *cmd_details)
 {
 {
 	struct i40e_aqc_list_capabilites *cmd;
 	struct i40e_aqc_list_capabilites *cmd;
-	i40e_status status = 0;
 	struct i40e_aq_desc desc;
 	struct i40e_aq_desc desc;
+	i40e_status status = 0;
 
 
 	cmd = (struct i40e_aqc_list_capabilites *)&desc.params.raw;
 	cmd = (struct i40e_aqc_list_capabilites *)&desc.params.raw;
 
 

+ 1 - 0
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

@@ -1552,6 +1552,7 @@ static int i40e_add_del_fdir_ethtool(struct i40e_vsi *vsi,
 
 
 	return ret;
 	return ret;
 }
 }
+
 /**
 /**
  * i40e_set_rxnfc - command to set RX flow classification rules
  * i40e_set_rxnfc - command to set RX flow classification rules
  * @netdev: network interface device structure
  * @netdev: network interface device structure

+ 2 - 2
drivers/net/ethernet/intel/i40e/i40e_main.c

@@ -43,7 +43,7 @@ static const char i40e_driver_string[] =
 	     __stringify(DRV_VERSION_MINOR) "." \
 	     __stringify(DRV_VERSION_MINOR) "." \
 	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
 	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
 const char i40e_driver_version_str[] = DRV_VERSION;
 const char i40e_driver_version_str[] = DRV_VERSION;
-static const char i40e_copyright[] = "Copyright (c) 2013 Intel Corporation.";
+static const char i40e_copyright[] = "Copyright (c) 2013 - 2014 Intel Corporation.";
 
 
 /* a bit of forward declarations */
 /* a bit of forward declarations */
 static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi);
 static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi);
@@ -1072,7 +1072,7 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr,
 		if (!i40e_find_filter(vsi, macaddr, f->vlan,
 		if (!i40e_find_filter(vsi, macaddr, f->vlan,
 				      is_vf, is_netdev)) {
 				      is_vf, is_netdev)) {
 			if (!i40e_add_filter(vsi, macaddr, f->vlan,
 			if (!i40e_add_filter(vsi, macaddr, f->vlan,
-						is_vf, is_netdev))
+					     is_vf, is_netdev))
 				return NULL;
 				return NULL;
 		}
 		}
 	}
 	}

+ 1 - 2
drivers/net/ethernet/intel/i40e/i40e_prototype.h

@@ -59,8 +59,7 @@ void i40e_debug_aq(struct i40e_hw *hw,
 
 
 void i40e_idle_aq(struct i40e_hw *hw);
 void i40e_idle_aq(struct i40e_hw *hw);
 bool i40e_check_asq_alive(struct i40e_hw *hw);
 bool i40e_check_asq_alive(struct i40e_hw *hw);
-i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw,
-				   bool unloading);
+i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
 
 
 u32 i40e_led_get(struct i40e_hw *hw);
 u32 i40e_led_get(struct i40e_hw *hw);
 void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink);
 void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink);