igbvf: Fix code comments and whitespace

Fix the code comments to align with the drivers/net/ commenting style.
Also fix other checkpatch errors such as using tabs where possible and
properly wrap lines to conform to the 80 char limit (unless it is
a string).

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>

1 files changed, 35 insertions, 38 deletions

diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index 2178f87e9f61..91a1190990ae 100644
--- a/drivers/net/ethernet/intel/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
@@ -13,8 +13,7 @@
   more details.
 
   You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  this program; if not, see <http://www.gnu.org/licenses/>.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
@@ -36,7 +35,6 @@
 #include "igbvf.h"
 #include <linux/if_vlan.h>
 
-
 struct igbvf_stats {
         char stat_string[ETH_GSTRING_LEN];
         int sizeof_stat;
@@ -74,7 +72,7 @@ static const char igbvf_gstrings_test[][ETH_GSTRING_LEN] = {
 #define IGBVF_TEST_LEN ARRAY_SIZE(igbvf_gstrings_test)
 
 static int igbvf_get_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
+                              struct ethtool_cmd *ecmd)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -111,18 +109,18 @@ static int igbvf_get_settings(struct net_device *netdev,
 }
 
 static int igbvf_set_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
+                              struct ethtool_cmd *ecmd)
 {
         return -EOPNOTSUPP;
 }
 
 static void igbvf_get_pauseparam(struct net_device *netdev,
-                                 struct ethtool_pauseparam *pause)
+                                 struct ethtool_pauseparam *pause)
 {
 }
 
 static int igbvf_set_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
+                                struct ethtool_pauseparam *pause)
 {
         return -EOPNOTSUPP;
 }
@@ -130,12 +128,14 @@ static int igbvf_set_pauseparam(struct net_device *netdev,
 static u32 igbvf_get_msglevel(struct net_device *netdev)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
+
         return adapter->msg_enable;
 }
 
 static void igbvf_set_msglevel(struct net_device *netdev, u32 data)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
+
         adapter->msg_enable = data;
 }
 
@@ -146,7 +146,7 @@ static int igbvf_get_regs_len(struct net_device *netdev)
 }
 
 static void igbvf_get_regs(struct net_device *netdev,
-                           struct ethtool_regs *regs, void *p)
+                           struct ethtool_regs *regs, void *p)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -175,19 +175,19 @@ static int igbvf_get_eeprom_len(struct net_device *netdev)
 }
 
 static int igbvf_get_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
+                            struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         return -EOPNOTSUPP;
 }
 
 static int igbvf_set_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
+                            struct ethtool_eeprom *eeprom, u8 *bytes)
 {
         return -EOPNOTSUPP;
 }
 
 static void igbvf_get_drvinfo(struct net_device *netdev,
-                              struct ethtool_drvinfo *drvinfo)
+                              struct ethtool_drvinfo *drvinfo)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
 
@@ -201,7 +201,7 @@ static void igbvf_get_drvinfo(struct net_device *netdev,
 }
 
 static void igbvf_get_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
+                                struct ethtool_ringparam *ring)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct igbvf_ring *tx_ring = adapter->tx_ring;
@@ -214,7 +214,7 @@ static void igbvf_get_ringparam(struct net_device *netdev,
 }
 
 static int igbvf_set_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
+                               struct ethtool_ringparam *ring)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct igbvf_ring *temp_ring;
@@ -255,10 +255,9 @@ static int igbvf_set_ringparam(struct net_device *netdev,
 
         igbvf_down(adapter);
 
-        /*
-         * We can't just free everything and then setup again,
+        /* We can't just free everything and then setup again,
          * because the ISRs in MSI-X mode get passed pointers
-         * to the tx and rx ring structs.
+         * to the Tx and Rx ring structs.
          */
         if (new_tx_count != adapter->tx_ring->count) {
                 memcpy(temp_ring, adapter->tx_ring, sizeof(struct igbvf_ring));
@@ -283,7 +282,7 @@ static int igbvf_set_ringparam(struct net_device *netdev,
 
                 igbvf_free_rx_resources(adapter->rx_ring);
 
-                memcpy(adapter->rx_ring, temp_ring,sizeof(struct igbvf_ring));
+                memcpy(adapter->rx_ring, temp_ring, sizeof(struct igbvf_ring));
         }
 err_setup:
         igbvf_up(adapter);
@@ -307,14 +306,13 @@ static int igbvf_link_test(struct igbvf_adapter *adapter, u64 *data)
 }
 
 static void igbvf_diag_test(struct net_device *netdev,
-                            struct ethtool_test *eth_test, u64 *data)
+                            struct ethtool_test *eth_test, u64 *data)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
 
         set_bit(__IGBVF_TESTING, &adapter->state);
 
-        /*
-         * Link test performed before hardware reset so autoneg doesn't
+        /* Link test performed before hardware reset so autoneg doesn't
          * interfere with test result
          */
         if (igbvf_link_test(adapter, &data[0]))
@@ -325,20 +323,20 @@ static void igbvf_diag_test(struct net_device *netdev,
 }
 
 static void igbvf_get_wol(struct net_device *netdev,
-                          struct ethtool_wolinfo *wol)
+                          struct ethtool_wolinfo *wol)
 {
         wol->supported = 0;
         wol->wolopts = 0;
 }
 
 static int igbvf_set_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
+                         struct ethtool_wolinfo *wol)
 {
         return -EOPNOTSUPP;
 }
 
 static int igbvf_get_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
+                              struct ethtool_coalesce *ec)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
 
@@ -351,13 +349,13 @@ static int igbvf_get_coalesce(struct net_device *netdev,
 }
 
 static int igbvf_set_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
+                              struct ethtool_coalesce *ec)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
         if ((ec->rx_coalesce_usecs >= IGBVF_MIN_ITR_USECS) &&
-             (ec->rx_coalesce_usecs <= IGBVF_MAX_ITR_USECS)) {
+            (ec->rx_coalesce_usecs <= IGBVF_MAX_ITR_USECS)) {
                 adapter->current_itr = ec->rx_coalesce_usecs << 2;
                 adapter->requested_itr = 1000000000 /
                                         (adapter->current_itr * 256);
@@ -366,8 +364,7 @@ static int igbvf_set_coalesce(struct net_device *netdev,
                 adapter->current_itr = IGBVF_START_ITR;
                 adapter->requested_itr = ec->rx_coalesce_usecs;
         } else if (ec->rx_coalesce_usecs == 0) {
-                /*
-                 * The user's desire is to turn off interrupt throttling
+                /* The user's desire is to turn off interrupt throttling
                  * altogether, but due to HW limitations, we can't do that.
                  * Instead we set a very small value in EITR, which would
                  * allow ~967k interrupts per second, but allow the adapter's
@@ -376,8 +373,9 @@ static int igbvf_set_coalesce(struct net_device *netdev,
                 adapter->current_itr = 4;
                 adapter->requested_itr = 1000000000 /
                                         (adapter->current_itr * 256);
-        } else
+        } else {
                 return -EINVAL;
+        }
 
         writel(adapter->current_itr,
                hw->hw_addr + adapter->rx_ring->itr_register);
@@ -388,15 +386,15 @@ static int igbvf_set_coalesce(struct net_device *netdev,
 static int igbvf_nway_reset(struct net_device *netdev)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
+
         if (netif_running(netdev))
                 igbvf_reinit_locked(adapter);
         return 0;
 }
 
-
 static void igbvf_get_ethtool_stats(struct net_device *netdev,
-                                    struct ethtool_stats *stats,
-                                    u64 *data)
+                                    struct ethtool_stats *stats,
+                                    u64 *data)
 {
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         int i;
@@ -404,19 +402,18 @@ static void igbvf_get_ethtool_stats(struct net_device *netdev,
         igbvf_update_stats(adapter);
         for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
                 char *p = (char *)adapter +
-                          igbvf_gstrings_stats[i].stat_offset;
+                          igbvf_gstrings_stats[i].stat_offset;
                 char *b = (char *)adapter +
-                          igbvf_gstrings_stats[i].base_stat_offset;
+                          igbvf_gstrings_stats[i].base_stat_offset;
                 data[i] = ((igbvf_gstrings_stats[i].sizeof_stat ==
-                            sizeof(u64)) ? (*(u64 *)p - *(u64 *)b) :
-                            (*(u32 *)p - *(u32 *)b));
+                            sizeof(u64)) ? (*(u64 *)p - *(u64 *)b) :
+                            (*(u32 *)p - *(u32 *)b));
         }
-
 }
 
 static int igbvf_get_sset_count(struct net_device *dev, int stringset)
 {
-        switch(stringset) {
+        switch (stringset) {
         case ETH_SS_TEST:
                 return IGBVF_TEST_LEN;
         case ETH_SS_STATS:
@@ -427,7 +424,7 @@ static int igbvf_get_sset_count(struct net_device *dev, int stringset)
 }
 
 static void igbvf_get_strings(struct net_device *netdev, u32 stringset,
-                              u8 *data)
+                              u8 *data)
 {
         u8 *p = data;
         int i;