diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_hw.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index 397acabccab6..6cb2e42ff4c1 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c | |||
@@ -167,7 +167,7 @@ ixgb_adapter_stop(struct ixgb_hw *hw) | |||
167 | /* Clear any pending interrupt events. */ | 167 | /* Clear any pending interrupt events. */ |
168 | icr_reg = IXGB_READ_REG(hw, ICR); | 168 | icr_reg = IXGB_READ_REG(hw, ICR); |
169 | 169 | ||
170 | return (ctrl_reg & IXGB_CTRL0_RST); | 170 | return ctrl_reg & IXGB_CTRL0_RST; |
171 | } | 171 | } |
172 | 172 | ||
173 | 173 | ||
@@ -209,7 +209,7 @@ ixgb_identify_xpak_vendor(struct ixgb_hw *hw) | |||
209 | xpak_vendor = ixgb_xpak_vendor_infineon; | 209 | xpak_vendor = ixgb_xpak_vendor_infineon; |
210 | } | 210 | } |
211 | 211 | ||
212 | return (xpak_vendor); | 212 | return xpak_vendor; |
213 | } | 213 | } |
214 | 214 | ||
215 | /****************************************************************************** | 215 | /****************************************************************************** |
@@ -273,7 +273,7 @@ ixgb_identify_phy(struct ixgb_hw *hw) | |||
273 | if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) | 273 | if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) |
274 | phy_type = ixgb_phy_type_bcm; | 274 | phy_type = ixgb_phy_type_bcm; |
275 | 275 | ||
276 | return (phy_type); | 276 | return phy_type; |
277 | } | 277 | } |
278 | 278 | ||
279 | /****************************************************************************** | 279 | /****************************************************************************** |
@@ -366,7 +366,7 @@ ixgb_init_hw(struct ixgb_hw *hw) | |||
366 | /* 82597EX errata: Call check-for-link in case lane deskew is locked */ | 366 | /* 82597EX errata: Call check-for-link in case lane deskew is locked */ |
367 | ixgb_check_for_link(hw); | 367 | ixgb_check_for_link(hw); |
368 | 368 | ||
369 | return (status); | 369 | return status; |
370 | } | 370 | } |
371 | 371 | ||
372 | /****************************************************************************** | 372 | /****************************************************************************** |
@@ -531,7 +531,7 @@ ixgb_hash_mc_addr(struct ixgb_hw *hw, | |||
531 | } | 531 | } |
532 | 532 | ||
533 | hash_value &= 0xFFF; | 533 | hash_value &= 0xFFF; |
534 | return (hash_value); | 534 | return hash_value; |
535 | } | 535 | } |
536 | 536 | ||
537 | /****************************************************************************** | 537 | /****************************************************************************** |
@@ -715,7 +715,7 @@ ixgb_setup_fc(struct ixgb_hw *hw) | |||
715 | } | 715 | } |
716 | IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water); | 716 | IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water); |
717 | } | 717 | } |
718 | return (status); | 718 | return status; |
719 | } | 719 | } |
720 | 720 | ||
721 | /****************************************************************************** | 721 | /****************************************************************************** |
@@ -1140,7 +1140,7 @@ mac_addr_valid(u8 *mac_addr) | |||
1140 | pr_debug("MAC address is all zeros\n"); | 1140 | pr_debug("MAC address is all zeros\n"); |
1141 | is_valid = false; | 1141 | is_valid = false; |
1142 | } | 1142 | } |
1143 | return (is_valid); | 1143 | return is_valid; |
1144 | } | 1144 | } |
1145 | 1145 | ||
1146 | /****************************************************************************** | 1146 | /****************************************************************************** |