Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / e1000e / param.c

diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 98da75dff936d73329d272adcf54f779796c5745..c16bd75b6caa3f85f4f510da7fb56bafcd0f2b40 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -45,7 +45,7 @@
 unsigned int copybreak = COPYBREAK_DEFAULT;
 module_param(copybreak, uint, 0644);
 MODULE_PARM_DESC(copybreak,
-       "Maximum size of packet that is copied to a new buffer on receive");
+                "Maximum size of packet that is copied to a new buffer on receive");
 
 /* All parameters are treated the same, as an integer array of values.
  * This macro just reduces the need to repeat the same declaration code
@@ -143,7 +143,8 @@ E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
  *
  * Default Value: 1 (enabled)
  */
-E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
+E1000_PARAM(WriteProtectNVM,
+           "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
 
 /* Enable CRC Stripping
  *
@@ -160,13 +161,18 @@ struct e1000_option {
        const char *err;
        int def;
        union {
-               struct { /* range_option info */
+               /* range_option info */
+               struct {
                        int min;
                        int max;
                } r;
-               struct { /* list_option info */
+               /* list_option info */
+               struct {
                        int nr;
-                       struct e1000_opt_list { int i; char *str; } *p;
+                       struct e1000_opt_list {
+                               int i;
+                               char *str;
+                       } *p;
                } l;
        } arg;
 };
@@ -246,7 +252,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                           "Using defaults for all values\n");
        }
 
-       { /* Transmit Interrupt Delay */
+       /* Transmit Interrupt Delay */
+       {
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Transmit Interrupt Delay",
@@ -265,7 +272,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->tx_int_delay = opt.def;
                }
        }
-       { /* Transmit Absolute Interrupt Delay */
+       /* Transmit Absolute Interrupt Delay */
+       {
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Transmit Absolute Interrupt Delay",
@@ -284,7 +292,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->tx_abs_int_delay = opt.def;
                }
        }
-       { /* Receive Interrupt Delay */
+       /* Receive Interrupt Delay */
+       {
                static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Interrupt Delay",
@@ -303,7 +312,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->rx_int_delay = opt.def;
                }
        }
-       { /* Receive Absolute Interrupt Delay */
+       /* Receive Absolute Interrupt Delay */
+       {
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Absolute Interrupt Delay",
@@ -322,7 +332,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->rx_abs_int_delay = opt.def;
                }
        }
-       { /* Interrupt Throttling Rate */
+       /* Interrupt Throttling Rate */
+       {
                static const struct e1000_option opt = {
                        .type = range_option,
                        .name = "Interrupt Throttling Rate (ints/sec)",
@@ -392,7 +403,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        break;
                }
        }
-       { /* Interrupt Mode */
+       /* Interrupt Mode */
+       {
                static struct e1000_option opt = {
                        .type = range_option,
                        .name = "Interrupt Mode",
@@ -435,7 +447,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                kfree(opt.err);
 #endif
        }
-       { /* Smart Power Down */
+       /* Smart Power Down */
+       {
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "PHY Smart Power Down",
@@ -450,7 +463,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                                adapter->flags |= FLAG_SMART_POWER_DOWN;
                }
        }
-       { /* CRC Stripping */
+       /* CRC Stripping */
+       {
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "CRC Stripping",
@@ -470,27 +484,28 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                        adapter->flags2 |= FLAG2_DFLT_CRC_STRIPPING;
                }
        }
-       { /* Kumeran Lock Loss Workaround */
+       /* Kumeran Lock Loss Workaround */
+       {
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "Kumeran Lock Loss Workaround",
                        .err  = "defaulting to Enabled",
                        .def  = OPTION_ENABLED
                };
+               bool enabled = opt.def;
 
                if (num_KumeranLockLoss > bd) {
                        unsigned int kmrn_lock_loss = KumeranLockLoss[bd];
                        e1000_validate_option(&kmrn_lock_loss, &opt, adapter);
-                       if (hw->mac.type == e1000_ich8lan)
-                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                               kmrn_lock_loss);
-               } else {
-                       if (hw->mac.type == e1000_ich8lan)
-                               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
-                                                                      opt.def);
+                       enabled = kmrn_lock_loss;
                }
+
+               if (hw->mac.type == e1000_ich8lan)
+                       e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw,
+                                                                    enabled);
        }
-       { /* Write-protect NVM */
+       /* Write-protect NVM */
+       {
                static const struct e1000_option opt = {
                        .type = enable_option,
                        .name = "Write-protect NVM",
@@ -500,7 +515,8 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 
                if (adapter->flags & FLAG_IS_ICH) {
                        if (num_WriteProtectNVM > bd) {
-                               unsigned int write_protect_nvm = WriteProtectNVM[bd];
+                               unsigned int write_protect_nvm =
+                                   WriteProtectNVM[bd];
                                e1000_validate_option(&write_protect_nvm, &opt,
                                                      adapter);
                                if (write_protect_nvm)