Intel Wired LAN drivers: Use static const

Based on work by Joe Perches <joe@perches.com>

Using static const to decrease data and overall object size.

CC: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>

2 files changed, 17 insertions, 16 deletions

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index c7e242b69a18..77d08e697b74 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -4892,11 +4892,11 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
         } else if (hw->phy_type == e1000_phy_igp) {     /* For IGP PHY */
                 u16 cur_agc_value;
                 u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
-                u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-                    { IGP01E1000_PHY_AGC_A,
-                        IGP01E1000_PHY_AGC_B,
-                        IGP01E1000_PHY_AGC_C,
-                        IGP01E1000_PHY_AGC_D
+                static const u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
+                       IGP01E1000_PHY_AGC_A,
+                       IGP01E1000_PHY_AGC_B,
+                       IGP01E1000_PHY_AGC_C,
+                       IGP01E1000_PHY_AGC_D
                 };
                 /* Read the AGC registers for all channels */
                 for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
@@ -5071,11 +5071,11 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up)
 {
         s32 ret_val;
         u16 phy_data, phy_saved_data, speed, duplex, i;
-        u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-            { IGP01E1000_PHY_AGC_PARAM_A,
-                IGP01E1000_PHY_AGC_PARAM_B,
-                IGP01E1000_PHY_AGC_PARAM_C,
-                IGP01E1000_PHY_AGC_PARAM_D
+        static const u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
+               IGP01E1000_PHY_AGC_PARAM_A,
+               IGP01E1000_PHY_AGC_PARAM_B,
+               IGP01E1000_PHY_AGC_PARAM_C,
+               IGP01E1000_PHY_AGC_PARAM_D
         };
         u16 min_length, max_length;
 
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index 10d8d98bb797..1301eba8b57a 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -352,12 +352,13 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
         }
         { /* Flow Control */
 
-                struct e1000_opt_list fc_list[] =
-                        {{ E1000_FC_NONE,    "Flow Control Disabled" },
-                         { E1000_FC_RX_PAUSE,"Flow Control Receive Only" },
-                         { E1000_FC_TX_PAUSE,"Flow Control Transmit Only" },
-                         { E1000_FC_FULL,    "Flow Control Enabled" },
-                         { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
+                static const struct e1000_opt_list fc_list[] = {
+                       { E1000_FC_NONE, "Flow Control Disabled" },
+                       { E1000_FC_RX_PAUSE, "Flow Control Receive Only" },
+                       { E1000_FC_TX_PAUSE, "Flow Control Transmit Only" },
+                       { E1000_FC_FULL, "Flow Control Enabled" },
+                       { E1000_FC_DEFAULT, "Flow Control Hardware Default" }
+                };
 
                 opt = (struct e1000_option) {
                         .type = list_option,