diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000e/es2lan.c | 4 | ||||
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 4 | ||||
-rw-r--r-- | drivers/net/e1000e/phy.c | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c index 79da6466b8b6..b18c644e13d1 100644 --- a/drivers/net/e1000e/es2lan.c +++ b/drivers/net/e1000e/es2lan.c | |||
@@ -100,8 +100,8 @@ | |||
100 | * with a lower bound at "index" and the upper bound at | 100 | * with a lower bound at "index" and the upper bound at |
101 | * "index + 5". | 101 | * "index + 5". |
102 | */ | 102 | */ |
103 | static const u16 e1000_gg82563_cable_length_table[] = | 103 | static const u16 e1000_gg82563_cable_length_table[] = { |
104 | { 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF }; | 104 | 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF }; |
105 | #define GG82563_CABLE_LENGTH_TABLE_SIZE \ | 105 | #define GG82563_CABLE_LENGTH_TABLE_SIZE \ |
106 | ARRAY_SIZE(e1000_gg82563_cable_length_table) | 106 | ARRAY_SIZE(e1000_gg82563_cable_length_table) |
107 | 107 | ||
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 15c63304bd91..affcacf6f5a9 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -753,8 +753,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, | |||
753 | int reg, int offset, u32 mask, u32 write) | 753 | int reg, int offset, u32 mask, u32 write) |
754 | { | 754 | { |
755 | u32 pat, val; | 755 | u32 pat, val; |
756 | static const u32 test[] = | 756 | static const u32 test[] = { |
757 | {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; | 757 | 0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; |
758 | for (pat = 0; pat < ARRAY_SIZE(test); pat++) { | 758 | for (pat = 0; pat < ARRAY_SIZE(test); pat++) { |
759 | E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset, | 759 | E1000_WRITE_REG_ARRAY(&adapter->hw, reg, offset, |
760 | (test[pat] & write)); | 760 | (test[pat] & write)); |
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index 95da38693b77..e297a23963a5 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c | |||
@@ -42,20 +42,20 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset, | |||
42 | u16 *data, bool read); | 42 | u16 *data, bool read); |
43 | 43 | ||
44 | /* Cable length tables */ | 44 | /* Cable length tables */ |
45 | static const u16 e1000_m88_cable_length_table[] = | 45 | static const u16 e1000_m88_cable_length_table[] = { |
46 | { 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED }; | 46 | 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED }; |
47 | #define M88E1000_CABLE_LENGTH_TABLE_SIZE \ | 47 | #define M88E1000_CABLE_LENGTH_TABLE_SIZE \ |
48 | ARRAY_SIZE(e1000_m88_cable_length_table) | 48 | ARRAY_SIZE(e1000_m88_cable_length_table) |
49 | 49 | ||
50 | static const u16 e1000_igp_2_cable_length_table[] = | 50 | static const u16 e1000_igp_2_cable_length_table[] = { |
51 | { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21, 0, 0, 0, 3, | 51 | 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21, 0, 0, 0, 3, |
52 | 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41, 6, 10, 14, 18, 22, | 52 | 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41, 6, 10, 14, 18, 22, |
53 | 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61, 21, 26, 31, 35, 40, | 53 | 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61, 21, 26, 31, 35, 40, |
54 | 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82, 40, 45, 51, 56, 61, | 54 | 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82, 40, 45, 51, 56, 61, |
55 | 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104, 60, 66, 72, 77, 82, | 55 | 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104, 60, 66, 72, 77, 82, |
56 | 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95, | 56 | 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121, 83, 89, 95, |
57 | 100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121, | 57 | 100, 105, 109, 113, 116, 119, 122, 124, 104, 109, 114, 118, 121, |
58 | 124}; | 58 | 124}; |
59 | #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \ | 59 | #define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \ |
60 | ARRAY_SIZE(e1000_igp_2_cable_length_table) | 60 | ARRAY_SIZE(e1000_igp_2_cable_length_table) |
61 | 61 | ||