diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-06-27 13:59:59 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-04 08:46:58 -0400 |
commit | 733596bea6ba7ea7949720b86794eda4e1b793d1 (patch) | |
tree | efec5e12ca2e1923ce04c468aee2fab1770179e6 /drivers | |
parent | 3b644cf6cef0324c595b86181220901b5bed0b99 (diff) |
igb: cleanup function header comments
Function header comments do not match function name.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 48 | ||||
-rw-r--r-- | drivers/net/igb/e1000_mac.c | 66 | ||||
-rw-r--r-- | drivers/net/igb/e1000_nvm.c | 30 | ||||
-rw-r--r-- | drivers/net/igb/e1000_phy.c | 62 |
4 files changed, 103 insertions, 103 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index 39d44dc072e9..e6dd387fdb0e 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
@@ -226,7 +226,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) | |||
226 | } | 226 | } |
227 | 227 | ||
228 | /** | 228 | /** |
229 | * e1000_acquire_phy_82575 - Acquire rights to access PHY | 229 | * igb_acquire_phy_82575 - Acquire rights to access PHY |
230 | * @hw: pointer to the HW structure | 230 | * @hw: pointer to the HW structure |
231 | * | 231 | * |
232 | * Acquire access rights to the correct PHY. This is a | 232 | * Acquire access rights to the correct PHY. This is a |
@@ -242,7 +242,7 @@ static s32 igb_acquire_phy_82575(struct e1000_hw *hw) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | /** | 244 | /** |
245 | * e1000_release_phy_82575 - Release rights to access PHY | 245 | * igb_release_phy_82575 - Release rights to access PHY |
246 | * @hw: pointer to the HW structure | 246 | * @hw: pointer to the HW structure |
247 | * | 247 | * |
248 | * A wrapper to release access rights to the correct PHY. This is a | 248 | * A wrapper to release access rights to the correct PHY. This is a |
@@ -257,7 +257,7 @@ static void igb_release_phy_82575(struct e1000_hw *hw) | |||
257 | } | 257 | } |
258 | 258 | ||
259 | /** | 259 | /** |
260 | * e1000_read_phy_reg_sgmii_82575 - Read PHY register using sgmii | 260 | * igb_read_phy_reg_sgmii_82575 - Read PHY register using sgmii |
261 | * @hw: pointer to the HW structure | 261 | * @hw: pointer to the HW structure |
262 | * @offset: register offset to be read | 262 | * @offset: register offset to be read |
263 | * @data: pointer to the read data | 263 | * @data: pointer to the read data |
@@ -310,7 +310,7 @@ static s32 igb_read_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset, | |||
310 | } | 310 | } |
311 | 311 | ||
312 | /** | 312 | /** |
313 | * e1000_write_phy_reg_sgmii_82575 - Write PHY register using sgmii | 313 | * igb_write_phy_reg_sgmii_82575 - Write PHY register using sgmii |
314 | * @hw: pointer to the HW structure | 314 | * @hw: pointer to the HW structure |
315 | * @offset: register offset to write to | 315 | * @offset: register offset to write to |
316 | * @data: data to write at register offset | 316 | * @data: data to write at register offset |
@@ -365,7 +365,7 @@ static s32 igb_write_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset, | |||
365 | } | 365 | } |
366 | 366 | ||
367 | /** | 367 | /** |
368 | * e1000_get_phy_id_82575 - Retreive PHY addr and id | 368 | * igb_get_phy_id_82575 - Retrieve PHY addr and id |
369 | * @hw: pointer to the HW structure | 369 | * @hw: pointer to the HW structure |
370 | * | 370 | * |
371 | * Retreives the PHY address and ID for both PHY's which do and do not use | 371 | * Retreives the PHY address and ID for both PHY's which do and do not use |
@@ -426,7 +426,7 @@ out: | |||
426 | } | 426 | } |
427 | 427 | ||
428 | /** | 428 | /** |
429 | * e1000_phy_hw_reset_sgmii_82575 - Performs a PHY reset | 429 | * igb_phy_hw_reset_sgmii_82575 - Performs a PHY reset |
430 | * @hw: pointer to the HW structure | 430 | * @hw: pointer to the HW structure |
431 | * | 431 | * |
432 | * Resets the PHY using the serial gigabit media independent interface. | 432 | * Resets the PHY using the serial gigabit media independent interface. |
@@ -457,7 +457,7 @@ out: | |||
457 | } | 457 | } |
458 | 458 | ||
459 | /** | 459 | /** |
460 | * e1000_set_d0_lplu_state_82575 - Set Low Power Linkup D0 state | 460 | * igb_set_d0_lplu_state_82575 - Set Low Power Linkup D0 state |
461 | * @hw: pointer to the HW structure | 461 | * @hw: pointer to the HW structure |
462 | * @active: true to enable LPLU, false to disable | 462 | * @active: true to enable LPLU, false to disable |
463 | * | 463 | * |
@@ -543,7 +543,7 @@ out: | |||
543 | } | 543 | } |
544 | 544 | ||
545 | /** | 545 | /** |
546 | * e1000_acquire_nvm_82575 - Request for access to EEPROM | 546 | * igb_acquire_nvm_82575 - Request for access to EEPROM |
547 | * @hw: pointer to the HW structure | 547 | * @hw: pointer to the HW structure |
548 | * | 548 | * |
549 | * Acquire the necessary semaphores for exclussive access to the EEPROM. | 549 | * Acquire the necessary semaphores for exclussive access to the EEPROM. |
@@ -569,7 +569,7 @@ out: | |||
569 | } | 569 | } |
570 | 570 | ||
571 | /** | 571 | /** |
572 | * e1000_release_nvm_82575 - Release exclusive access to EEPROM | 572 | * igb_release_nvm_82575 - Release exclusive access to EEPROM |
573 | * @hw: pointer to the HW structure | 573 | * @hw: pointer to the HW structure |
574 | * | 574 | * |
575 | * Stop any current commands to the EEPROM and clear the EEPROM request bit, | 575 | * Stop any current commands to the EEPROM and clear the EEPROM request bit, |
@@ -582,7 +582,7 @@ static void igb_release_nvm_82575(struct e1000_hw *hw) | |||
582 | } | 582 | } |
583 | 583 | ||
584 | /** | 584 | /** |
585 | * e1000_acquire_swfw_sync_82575 - Acquire SW/FW semaphore | 585 | * igb_acquire_swfw_sync_82575 - Acquire SW/FW semaphore |
586 | * @hw: pointer to the HW structure | 586 | * @hw: pointer to the HW structure |
587 | * @mask: specifies which semaphore to acquire | 587 | * @mask: specifies which semaphore to acquire |
588 | * | 588 | * |
@@ -632,7 +632,7 @@ out: | |||
632 | } | 632 | } |
633 | 633 | ||
634 | /** | 634 | /** |
635 | * e1000_release_swfw_sync_82575 - Release SW/FW semaphore | 635 | * igb_release_swfw_sync_82575 - Release SW/FW semaphore |
636 | * @hw: pointer to the HW structure | 636 | * @hw: pointer to the HW structure |
637 | * @mask: specifies which semaphore to acquire | 637 | * @mask: specifies which semaphore to acquire |
638 | * | 638 | * |
@@ -654,7 +654,7 @@ static void igb_release_swfw_sync_82575(struct e1000_hw *hw, u16 mask) | |||
654 | } | 654 | } |
655 | 655 | ||
656 | /** | 656 | /** |
657 | * e1000_get_cfg_done_82575 - Read config done bit | 657 | * igb_get_cfg_done_82575 - Read config done bit |
658 | * @hw: pointer to the HW structure | 658 | * @hw: pointer to the HW structure |
659 | * | 659 | * |
660 | * Read the management control register for the config done bit for | 660 | * Read the management control register for the config done bit for |
@@ -690,7 +690,7 @@ static s32 igb_get_cfg_done_82575(struct e1000_hw *hw) | |||
690 | } | 690 | } |
691 | 691 | ||
692 | /** | 692 | /** |
693 | * e1000_check_for_link_82575 - Check for link | 693 | * igb_check_for_link_82575 - Check for link |
694 | * @hw: pointer to the HW structure | 694 | * @hw: pointer to the HW structure |
695 | * | 695 | * |
696 | * If sgmii is enabled, then use the pcs register to determine link, otherwise | 696 | * If sgmii is enabled, then use the pcs register to determine link, otherwise |
@@ -713,7 +713,7 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw) | |||
713 | } | 713 | } |
714 | 714 | ||
715 | /** | 715 | /** |
716 | * e1000_get_pcs_speed_and_duplex_82575 - Retrieve current speed/duplex | 716 | * igb_get_pcs_speed_and_duplex_82575 - Retrieve current speed/duplex |
717 | * @hw: pointer to the HW structure | 717 | * @hw: pointer to the HW structure |
718 | * @speed: stores the current speed | 718 | * @speed: stores the current speed |
719 | * @duplex: stores the current duplex | 719 | * @duplex: stores the current duplex |
@@ -768,7 +768,7 @@ static s32 igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw, u16 *speed, | |||
768 | } | 768 | } |
769 | 769 | ||
770 | /** | 770 | /** |
771 | * e1000_rar_set_82575 - Set receive address register | 771 | * igb_rar_set_82575 - Set receive address register |
772 | * @hw: pointer to the HW structure | 772 | * @hw: pointer to the HW structure |
773 | * @addr: pointer to the receive address | 773 | * @addr: pointer to the receive address |
774 | * @index: receive address array register | 774 | * @index: receive address array register |
@@ -785,7 +785,7 @@ static void igb_rar_set_82575(struct e1000_hw *hw, u8 *addr, u32 index) | |||
785 | } | 785 | } |
786 | 786 | ||
787 | /** | 787 | /** |
788 | * e1000_reset_hw_82575 - Reset hardware | 788 | * igb_reset_hw_82575 - Reset hardware |
789 | * @hw: pointer to the HW structure | 789 | * @hw: pointer to the HW structure |
790 | * | 790 | * |
791 | * This resets the hardware into a known state. This is a | 791 | * This resets the hardware into a known state. This is a |
@@ -842,7 +842,7 @@ static s32 igb_reset_hw_82575(struct e1000_hw *hw) | |||
842 | } | 842 | } |
843 | 843 | ||
844 | /** | 844 | /** |
845 | * e1000_init_hw_82575 - Initialize hardware | 845 | * igb_init_hw_82575 - Initialize hardware |
846 | * @hw: pointer to the HW structure | 846 | * @hw: pointer to the HW structure |
847 | * | 847 | * |
848 | * This inits the hardware readying it for operation. | 848 | * This inits the hardware readying it for operation. |
@@ -886,7 +886,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw) | |||
886 | } | 886 | } |
887 | 887 | ||
888 | /** | 888 | /** |
889 | * e1000_setup_copper_link_82575 - Configure copper link settings | 889 | * igb_setup_copper_link_82575 - Configure copper link settings |
890 | * @hw: pointer to the HW structure | 890 | * @hw: pointer to the HW structure |
891 | * | 891 | * |
892 | * Configures the link for auto-neg or forced speed and duplex. Then we check | 892 | * Configures the link for auto-neg or forced speed and duplex. Then we check |
@@ -974,7 +974,7 @@ out: | |||
974 | } | 974 | } |
975 | 975 | ||
976 | /** | 976 | /** |
977 | * e1000_setup_fiber_serdes_link_82575 - Setup link for fiber/serdes | 977 | * igb_setup_fiber_serdes_link_82575 - Setup link for fiber/serdes |
978 | * @hw: pointer to the HW structure | 978 | * @hw: pointer to the HW structure |
979 | * | 979 | * |
980 | * Configures speed and duplex for fiber and serdes links. | 980 | * Configures speed and duplex for fiber and serdes links. |
@@ -1038,7 +1038,7 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *hw) | |||
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | /** | 1040 | /** |
1041 | * e1000_configure_pcs_link_82575 - Configure PCS link | 1041 | * igb_configure_pcs_link_82575 - Configure PCS link |
1042 | * @hw: pointer to the HW structure | 1042 | * @hw: pointer to the HW structure |
1043 | * | 1043 | * |
1044 | * Configure the physical coding sub-layer (PCS) link. The PCS link is | 1044 | * Configure the physical coding sub-layer (PCS) link. The PCS link is |
@@ -1103,7 +1103,7 @@ out: | |||
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | /** | 1105 | /** |
1106 | * e1000_sgmii_active_82575 - Return sgmii state | 1106 | * igb_sgmii_active_82575 - Return sgmii state |
1107 | * @hw: pointer to the HW structure | 1107 | * @hw: pointer to the HW structure |
1108 | * | 1108 | * |
1109 | * 82575 silicon has a serialized gigabit media independent interface (sgmii) | 1109 | * 82575 silicon has a serialized gigabit media independent interface (sgmii) |
@@ -1129,7 +1129,7 @@ out: | |||
1129 | } | 1129 | } |
1130 | 1130 | ||
1131 | /** | 1131 | /** |
1132 | * e1000_reset_init_script_82575 - Inits HW defaults after reset | 1132 | * igb_reset_init_script_82575 - Inits HW defaults after reset |
1133 | * @hw: pointer to the HW structure | 1133 | * @hw: pointer to the HW structure |
1134 | * | 1134 | * |
1135 | * Inits recommended HW defaults after a reset when there is no EEPROM | 1135 | * Inits recommended HW defaults after a reset when there is no EEPROM |
@@ -1165,7 +1165,7 @@ static s32 igb_reset_init_script_82575(struct e1000_hw *hw) | |||
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | /** | 1167 | /** |
1168 | * e1000_read_mac_addr_82575 - Read device MAC address | 1168 | * igb_read_mac_addr_82575 - Read device MAC address |
1169 | * @hw: pointer to the HW structure | 1169 | * @hw: pointer to the HW structure |
1170 | **/ | 1170 | **/ |
1171 | static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) | 1171 | static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) |
@@ -1179,7 +1179,7 @@ static s32 igb_read_mac_addr_82575(struct e1000_hw *hw) | |||
1179 | } | 1179 | } |
1180 | 1180 | ||
1181 | /** | 1181 | /** |
1182 | * e1000_clear_hw_cntrs_82575 - Clear device specific hardware counters | 1182 | * igb_clear_hw_cntrs_82575 - Clear device specific hardware counters |
1183 | * @hw: pointer to the HW structure | 1183 | * @hw: pointer to the HW structure |
1184 | * | 1184 | * |
1185 | * Clears the hardware counters by reading the counter registers. | 1185 | * Clears the hardware counters by reading the counter registers. |
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c index 3e84a3f0c1d8..0dadcfdfa176 100644 --- a/drivers/net/igb/e1000_mac.c +++ b/drivers/net/igb/e1000_mac.c | |||
@@ -39,7 +39,7 @@ static s32 igb_set_fc_watermarks(struct e1000_hw *hw); | |||
39 | static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr); | 39 | static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr); |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * e1000_remove_device - Free device specific structure | 42 | * igb_remove_device - Free device specific structure |
43 | * @hw: pointer to the HW structure | 43 | * @hw: pointer to the HW structure |
44 | * | 44 | * |
45 | * If a device specific structure was allocated, this function will | 45 | * If a device specific structure was allocated, this function will |
@@ -73,7 +73,7 @@ static s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value) | |||
73 | } | 73 | } |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * e1000_get_bus_info_pcie - Get PCIe bus information | 76 | * igb_get_bus_info_pcie - Get PCIe bus information |
77 | * @hw: pointer to the HW structure | 77 | * @hw: pointer to the HW structure |
78 | * | 78 | * |
79 | * Determines and stores the system bus information for a particular | 79 | * Determines and stores the system bus information for a particular |
@@ -113,7 +113,7 @@ s32 igb_get_bus_info_pcie(struct e1000_hw *hw) | |||
113 | } | 113 | } |
114 | 114 | ||
115 | /** | 115 | /** |
116 | * e1000_clear_vfta - Clear VLAN filter table | 116 | * igb_clear_vfta - Clear VLAN filter table |
117 | * @hw: pointer to the HW structure | 117 | * @hw: pointer to the HW structure |
118 | * | 118 | * |
119 | * Clears the register array which contains the VLAN filter table by | 119 | * Clears the register array which contains the VLAN filter table by |
@@ -130,7 +130,7 @@ void igb_clear_vfta(struct e1000_hw *hw) | |||
130 | } | 130 | } |
131 | 131 | ||
132 | /** | 132 | /** |
133 | * e1000_write_vfta - Write value to VLAN filter table | 133 | * igb_write_vfta - Write value to VLAN filter table |
134 | * @hw: pointer to the HW structure | 134 | * @hw: pointer to the HW structure |
135 | * @offset: register offset in VLAN filter table | 135 | * @offset: register offset in VLAN filter table |
136 | * @value: register value written to VLAN filter table | 136 | * @value: register value written to VLAN filter table |
@@ -145,7 +145,7 @@ void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value) | |||
145 | } | 145 | } |
146 | 146 | ||
147 | /** | 147 | /** |
148 | * e1000_init_rx_addrs - Initialize receive address's | 148 | * igb_init_rx_addrs - Initialize receive address's |
149 | * @hw: pointer to the HW structure | 149 | * @hw: pointer to the HW structure |
150 | * @rar_count: receive address registers | 150 | * @rar_count: receive address registers |
151 | * | 151 | * |
@@ -173,7 +173,7 @@ void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count) | |||
173 | } | 173 | } |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * e1000_check_alt_mac_addr - Check for alternate MAC addr | 176 | * igb_check_alt_mac_addr - Check for alternate MAC addr |
177 | * @hw: pointer to the HW structure | 177 | * @hw: pointer to the HW structure |
178 | * | 178 | * |
179 | * Checks the nvm for an alternate MAC address. An alternate MAC address | 179 | * Checks the nvm for an alternate MAC address. An alternate MAC address |
@@ -233,7 +233,7 @@ out: | |||
233 | } | 233 | } |
234 | 234 | ||
235 | /** | 235 | /** |
236 | * e1000_rar_set - Set receive address register | 236 | * igb_rar_set - Set receive address register |
237 | * @hw: pointer to the HW structure | 237 | * @hw: pointer to the HW structure |
238 | * @addr: pointer to the receive address | 238 | * @addr: pointer to the receive address |
239 | * @index: receive address array register | 239 | * @index: receive address array register |
@@ -263,7 +263,7 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | /** | 265 | /** |
266 | * e1000_mta_set - Set multicast filter table address | 266 | * igb_mta_set - Set multicast filter table address |
267 | * @hw: pointer to the HW structure | 267 | * @hw: pointer to the HW structure |
268 | * @hash_value: determines the MTA register and bit to set | 268 | * @hash_value: determines the MTA register and bit to set |
269 | * | 269 | * |
@@ -298,7 +298,7 @@ static void igb_mta_set(struct e1000_hw *hw, u32 hash_value) | |||
298 | } | 298 | } |
299 | 299 | ||
300 | /** | 300 | /** |
301 | * e1000_update_mc_addr_list - Update Multicast addresses | 301 | * igb_update_mc_addr_list - Update Multicast addresses |
302 | * @hw: pointer to the HW structure | 302 | * @hw: pointer to the HW structure |
303 | * @mc_addr_list: array of multicast addresses to program | 303 | * @mc_addr_list: array of multicast addresses to program |
304 | * @mc_addr_count: number of multicast addresses to program | 304 | * @mc_addr_count: number of multicast addresses to program |
@@ -352,7 +352,7 @@ void igb_update_mc_addr_list(struct e1000_hw *hw, | |||
352 | } | 352 | } |
353 | 353 | ||
354 | /** | 354 | /** |
355 | * e1000_hash_mc_addr - Generate a multicast hash value | 355 | * igb_hash_mc_addr - Generate a multicast hash value |
356 | * @hw: pointer to the HW structure | 356 | * @hw: pointer to the HW structure |
357 | * @mc_addr: pointer to a multicast address | 357 | * @mc_addr: pointer to a multicast address |
358 | * | 358 | * |
@@ -423,7 +423,7 @@ static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr) | |||
423 | } | 423 | } |
424 | 424 | ||
425 | /** | 425 | /** |
426 | * e1000_clear_hw_cntrs_base - Clear base hardware counters | 426 | * igb_clear_hw_cntrs_base - Clear base hardware counters |
427 | * @hw: pointer to the HW structure | 427 | * @hw: pointer to the HW structure |
428 | * | 428 | * |
429 | * Clears the base hardware counters by reading the counter registers. | 429 | * Clears the base hardware counters by reading the counter registers. |
@@ -472,7 +472,7 @@ void igb_clear_hw_cntrs_base(struct e1000_hw *hw) | |||
472 | } | 472 | } |
473 | 473 | ||
474 | /** | 474 | /** |
475 | * e1000_check_for_copper_link - Check for link (Copper) | 475 | * igb_check_for_copper_link - Check for link (Copper) |
476 | * @hw: pointer to the HW structure | 476 | * @hw: pointer to the HW structure |
477 | * | 477 | * |
478 | * Checks to see of the link status of the hardware has changed. If a | 478 | * Checks to see of the link status of the hardware has changed. If a |
@@ -547,7 +547,7 @@ out: | |||
547 | } | 547 | } |
548 | 548 | ||
549 | /** | 549 | /** |
550 | * e1000_setup_link - Setup flow control and link settings | 550 | * igb_setup_link - Setup flow control and link settings |
551 | * @hw: pointer to the HW structure | 551 | * @hw: pointer to the HW structure |
552 | * | 552 | * |
553 | * Determines which flow control settings to use, then configures flow | 553 | * Determines which flow control settings to use, then configures flow |
@@ -606,7 +606,7 @@ out: | |||
606 | } | 606 | } |
607 | 607 | ||
608 | /** | 608 | /** |
609 | * e1000_config_collision_dist - Configure collision distance | 609 | * igb_config_collision_dist - Configure collision distance |
610 | * @hw: pointer to the HW structure | 610 | * @hw: pointer to the HW structure |
611 | * | 611 | * |
612 | * Configures the collision distance to the default value and is used | 612 | * Configures the collision distance to the default value and is used |
@@ -627,7 +627,7 @@ void igb_config_collision_dist(struct e1000_hw *hw) | |||
627 | } | 627 | } |
628 | 628 | ||
629 | /** | 629 | /** |
630 | * e1000_set_fc_watermarks - Set flow control high/low watermarks | 630 | * igb_set_fc_watermarks - Set flow control high/low watermarks |
631 | * @hw: pointer to the HW structure | 631 | * @hw: pointer to the HW structure |
632 | * | 632 | * |
633 | * Sets the flow control high/low threshold (watermark) registers. If | 633 | * Sets the flow control high/low threshold (watermark) registers. If |
@@ -665,7 +665,7 @@ static s32 igb_set_fc_watermarks(struct e1000_hw *hw) | |||
665 | } | 665 | } |
666 | 666 | ||
667 | /** | 667 | /** |
668 | * e1000_set_default_fc - Set flow control default values | 668 | * igb_set_default_fc - Set flow control default values |
669 | * @hw: pointer to the HW structure | 669 | * @hw: pointer to the HW structure |
670 | * | 670 | * |
671 | * Read the EEPROM for the default values for flow control and store the | 671 | * Read the EEPROM for the default values for flow control and store the |
@@ -706,7 +706,7 @@ out: | |||
706 | } | 706 | } |
707 | 707 | ||
708 | /** | 708 | /** |
709 | * e1000_force_mac_fc - Force the MAC's flow control settings | 709 | * igb_force_mac_fc - Force the MAC's flow control settings |
710 | * @hw: pointer to the HW structure | 710 | * @hw: pointer to the HW structure |
711 | * | 711 | * |
712 | * Force the MAC's flow control settings. Sets the TFCE and RFCE bits in the | 712 | * Force the MAC's flow control settings. Sets the TFCE and RFCE bits in the |
@@ -770,7 +770,7 @@ out: | |||
770 | } | 770 | } |
771 | 771 | ||
772 | /** | 772 | /** |
773 | * e1000_config_fc_after_link_up - Configures flow control after link | 773 | * igb_config_fc_after_link_up - Configures flow control after link |
774 | * @hw: pointer to the HW structure | 774 | * @hw: pointer to the HW structure |
775 | * | 775 | * |
776 | * Checks the status of auto-negotiation after link up to ensure that the | 776 | * Checks the status of auto-negotiation after link up to ensure that the |
@@ -991,7 +991,7 @@ out: | |||
991 | } | 991 | } |
992 | 992 | ||
993 | /** | 993 | /** |
994 | * e1000_get_speed_and_duplex_copper - Retreive current speed/duplex | 994 | * igb_get_speed_and_duplex_copper - Retreive current speed/duplex |
995 | * @hw: pointer to the HW structure | 995 | * @hw: pointer to the HW structure |
996 | * @speed: stores the current speed | 996 | * @speed: stores the current speed |
997 | * @duplex: stores the current duplex | 997 | * @duplex: stores the current duplex |
@@ -1028,7 +1028,7 @@ s32 igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, | |||
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | /** | 1030 | /** |
1031 | * e1000_get_hw_semaphore - Acquire hardware semaphore | 1031 | * igb_get_hw_semaphore - Acquire hardware semaphore |
1032 | * @hw: pointer to the HW structure | 1032 | * @hw: pointer to the HW structure |
1033 | * | 1033 | * |
1034 | * Acquire the HW semaphore to access the PHY or NVM | 1034 | * Acquire the HW semaphore to access the PHY or NVM |
@@ -1081,7 +1081,7 @@ out: | |||
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | /** | 1083 | /** |
1084 | * e1000_put_hw_semaphore - Release hardware semaphore | 1084 | * igb_put_hw_semaphore - Release hardware semaphore |
1085 | * @hw: pointer to the HW structure | 1085 | * @hw: pointer to the HW structure |
1086 | * | 1086 | * |
1087 | * Release hardware semaphore used to access the PHY or NVM | 1087 | * Release hardware semaphore used to access the PHY or NVM |
@@ -1098,7 +1098,7 @@ void igb_put_hw_semaphore(struct e1000_hw *hw) | |||
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | /** | 1100 | /** |
1101 | * e1000_get_auto_rd_done - Check for auto read completion | 1101 | * igb_get_auto_rd_done - Check for auto read completion |
1102 | * @hw: pointer to the HW structure | 1102 | * @hw: pointer to the HW structure |
1103 | * | 1103 | * |
1104 | * Check EEPROM for Auto Read done bit. | 1104 | * Check EEPROM for Auto Read done bit. |
@@ -1127,7 +1127,7 @@ out: | |||
1127 | } | 1127 | } |
1128 | 1128 | ||
1129 | /** | 1129 | /** |
1130 | * e1000_valid_led_default - Verify a valid default LED config | 1130 | * igb_valid_led_default - Verify a valid default LED config |
1131 | * @hw: pointer to the HW structure | 1131 | * @hw: pointer to the HW structure |
1132 | * @data: pointer to the NVM (EEPROM) | 1132 | * @data: pointer to the NVM (EEPROM) |
1133 | * | 1133 | * |
@@ -1152,7 +1152,7 @@ out: | |||
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | /** | 1154 | /** |
1155 | * e1000_id_led_init - | 1155 | * igb_id_led_init - |
1156 | * @hw: pointer to the HW structure | 1156 | * @hw: pointer to the HW structure |
1157 | * | 1157 | * |
1158 | **/ | 1158 | **/ |
@@ -1217,7 +1217,7 @@ out: | |||
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | /** | 1219 | /** |
1220 | * e1000_cleanup_led - Set LED config to default operation | 1220 | * igb_cleanup_led - Set LED config to default operation |
1221 | * @hw: pointer to the HW structure | 1221 | * @hw: pointer to the HW structure |
1222 | * | 1222 | * |
1223 | * Remove the current LED configuration and set the LED configuration | 1223 | * Remove the current LED configuration and set the LED configuration |
@@ -1230,7 +1230,7 @@ s32 igb_cleanup_led(struct e1000_hw *hw) | |||
1230 | } | 1230 | } |
1231 | 1231 | ||
1232 | /** | 1232 | /** |
1233 | * e1000_blink_led - Blink LED | 1233 | * igb_blink_led - Blink LED |
1234 | * @hw: pointer to the HW structure | 1234 | * @hw: pointer to the HW structure |
1235 | * | 1235 | * |
1236 | * Blink the led's which are set to be on. | 1236 | * Blink the led's which are set to be on. |
@@ -1263,7 +1263,7 @@ s32 igb_blink_led(struct e1000_hw *hw) | |||
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | /** | 1265 | /** |
1266 | * e1000_led_off - Turn LED off | 1266 | * igb_led_off - Turn LED off |
1267 | * @hw: pointer to the HW structure | 1267 | * @hw: pointer to the HW structure |
1268 | * | 1268 | * |
1269 | * Turn LED off. | 1269 | * Turn LED off. |
@@ -1290,7 +1290,7 @@ s32 igb_led_off(struct e1000_hw *hw) | |||
1290 | } | 1290 | } |
1291 | 1291 | ||
1292 | /** | 1292 | /** |
1293 | * e1000_disable_pcie_master - Disables PCI-express master access | 1293 | * igb_disable_pcie_master - Disables PCI-express master access |
1294 | * @hw: pointer to the HW structure | 1294 | * @hw: pointer to the HW structure |
1295 | * | 1295 | * |
1296 | * Returns 0 (0) if successful, else returns -10 | 1296 | * Returns 0 (0) if successful, else returns -10 |
@@ -1332,7 +1332,7 @@ out: | |||
1332 | } | 1332 | } |
1333 | 1333 | ||
1334 | /** | 1334 | /** |
1335 | * e1000_reset_adaptive - Reset Adaptive Interframe Spacing | 1335 | * igb_reset_adaptive - Reset Adaptive Interframe Spacing |
1336 | * @hw: pointer to the HW structure | 1336 | * @hw: pointer to the HW structure |
1337 | * | 1337 | * |
1338 | * Reset the Adaptive Interframe Spacing throttle to default values. | 1338 | * Reset the Adaptive Interframe Spacing throttle to default values. |
@@ -1361,7 +1361,7 @@ out: | |||
1361 | } | 1361 | } |
1362 | 1362 | ||
1363 | /** | 1363 | /** |
1364 | * e1000_update_adaptive - Update Adaptive Interframe Spacing | 1364 | * igb_update_adaptive - Update Adaptive Interframe Spacing |
1365 | * @hw: pointer to the HW structure | 1365 | * @hw: pointer to the HW structure |
1366 | * | 1366 | * |
1367 | * Update the Adaptive Interframe Spacing Throttle value based on the | 1367 | * Update the Adaptive Interframe Spacing Throttle value based on the |
@@ -1402,7 +1402,7 @@ out: | |||
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | /** | 1404 | /** |
1405 | * e1000_validate_mdi_setting - Verify MDI/MDIx settings | 1405 | * igb_validate_mdi_setting - Verify MDI/MDIx settings |
1406 | * @hw: pointer to the HW structure | 1406 | * @hw: pointer to the HW structure |
1407 | * | 1407 | * |
1408 | * Verify that when not using auto-negotitation that MDI/MDIx is correctly | 1408 | * Verify that when not using auto-negotitation that MDI/MDIx is correctly |
@@ -1424,7 +1424,7 @@ out: | |||
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | /** | 1426 | /** |
1427 | * e1000_write_8bit_ctrl_reg - Write a 8bit CTRL register | 1427 | * igb_write_8bit_ctrl_reg - Write a 8bit CTRL register |
1428 | * @hw: pointer to the HW structure | 1428 | * @hw: pointer to the HW structure |
1429 | * @reg: 32bit register offset such as E1000_SCTL | 1429 | * @reg: 32bit register offset such as E1000_SCTL |
1430 | * @offset: register offset to write to | 1430 | * @offset: register offset to write to |
@@ -1462,7 +1462,7 @@ out: | |||
1462 | } | 1462 | } |
1463 | 1463 | ||
1464 | /** | 1464 | /** |
1465 | * e1000_enable_mng_pass_thru - Enable processing of ARP's | 1465 | * igb_enable_mng_pass_thru - Enable processing of ARP's |
1466 | * @hw: pointer to the HW structure | 1466 | * @hw: pointer to the HW structure |
1467 | * | 1467 | * |
1468 | * Verifies the hardware needs to allow ARPs to be processed by the host. | 1468 | * Verifies the hardware needs to allow ARPs to be processed by the host. |
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/igb/e1000_nvm.c index 2897106fee92..780ba798ce8f 100644 --- a/drivers/net/igb/e1000_nvm.c +++ b/drivers/net/igb/e1000_nvm.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "e1000_nvm.h" | 32 | #include "e1000_nvm.h" |
33 | 33 | ||
34 | /** | 34 | /** |
35 | * e1000_raise_eec_clk - Raise EEPROM clock | 35 | * igb_raise_eec_clk - Raise EEPROM clock |
36 | * @hw: pointer to the HW structure | 36 | * @hw: pointer to the HW structure |
37 | * @eecd: pointer to the EEPROM | 37 | * @eecd: pointer to the EEPROM |
38 | * | 38 | * |
@@ -47,7 +47,7 @@ static void igb_raise_eec_clk(struct e1000_hw *hw, u32 *eecd) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * e1000_lower_eec_clk - Lower EEPROM clock | 50 | * igb_lower_eec_clk - Lower EEPROM clock |
51 | * @hw: pointer to the HW structure | 51 | * @hw: pointer to the HW structure |
52 | * @eecd: pointer to the EEPROM | 52 | * @eecd: pointer to the EEPROM |
53 | * | 53 | * |
@@ -62,7 +62,7 @@ static void igb_lower_eec_clk(struct e1000_hw *hw, u32 *eecd) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * e1000_shift_out_eec_bits - Shift data bits our to the EEPROM | 65 | * igb_shift_out_eec_bits - Shift data bits our to the EEPROM |
66 | * @hw: pointer to the HW structure | 66 | * @hw: pointer to the HW structure |
67 | * @data: data to send to the EEPROM | 67 | * @data: data to send to the EEPROM |
68 | * @count: number of bits to shift out | 68 | * @count: number of bits to shift out |
@@ -105,7 +105,7 @@ static void igb_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * e1000_shift_in_eec_bits - Shift data bits in from the EEPROM | 108 | * igb_shift_in_eec_bits - Shift data bits in from the EEPROM |
109 | * @hw: pointer to the HW structure | 109 | * @hw: pointer to the HW structure |
110 | * @count: number of bits to shift in | 110 | * @count: number of bits to shift in |
111 | * | 111 | * |
@@ -143,7 +143,7 @@ static u16 igb_shift_in_eec_bits(struct e1000_hw *hw, u16 count) | |||
143 | } | 143 | } |
144 | 144 | ||
145 | /** | 145 | /** |
146 | * e1000_poll_eerd_eewr_done - Poll for EEPROM read/write completion | 146 | * igb_poll_eerd_eewr_done - Poll for EEPROM read/write completion |
147 | * @hw: pointer to the HW structure | 147 | * @hw: pointer to the HW structure |
148 | * @ee_reg: EEPROM flag for polling | 148 | * @ee_reg: EEPROM flag for polling |
149 | * | 149 | * |
@@ -174,7 +174,7 @@ static s32 igb_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg) | |||
174 | } | 174 | } |
175 | 175 | ||
176 | /** | 176 | /** |
177 | * e1000_acquire_nvm - Generic request for access to EEPROM | 177 | * igb_acquire_nvm - Generic request for access to EEPROM |
178 | * @hw: pointer to the HW structure | 178 | * @hw: pointer to the HW structure |
179 | * | 179 | * |
180 | * Set the EEPROM access request bit and wait for EEPROM access grant bit. | 180 | * Set the EEPROM access request bit and wait for EEPROM access grant bit. |
@@ -210,7 +210,7 @@ s32 igb_acquire_nvm(struct e1000_hw *hw) | |||
210 | } | 210 | } |
211 | 211 | ||
212 | /** | 212 | /** |
213 | * e1000_standby_nvm - Return EEPROM to standby state | 213 | * igb_standby_nvm - Return EEPROM to standby state |
214 | * @hw: pointer to the HW structure | 214 | * @hw: pointer to the HW structure |
215 | * | 215 | * |
216 | * Return the EEPROM to a standby state. | 216 | * Return the EEPROM to a standby state. |
@@ -273,7 +273,7 @@ static void e1000_stop_nvm(struct e1000_hw *hw) | |||
273 | } | 273 | } |
274 | 274 | ||
275 | /** | 275 | /** |
276 | * e1000_release_nvm - Release exclusive access to EEPROM | 276 | * igb_release_nvm - Release exclusive access to EEPROM |
277 | * @hw: pointer to the HW structure | 277 | * @hw: pointer to the HW structure |
278 | * | 278 | * |
279 | * Stop any current commands to the EEPROM and clear the EEPROM request bit. | 279 | * Stop any current commands to the EEPROM and clear the EEPROM request bit. |
@@ -290,7 +290,7 @@ void igb_release_nvm(struct e1000_hw *hw) | |||
290 | } | 290 | } |
291 | 291 | ||
292 | /** | 292 | /** |
293 | * e1000_ready_nvm_eeprom - Prepares EEPROM for read/write | 293 | * igb_ready_nvm_eeprom - Prepares EEPROM for read/write |
294 | * @hw: pointer to the HW structure | 294 | * @hw: pointer to the HW structure |
295 | * | 295 | * |
296 | * Setups the EEPROM for reading and writing. | 296 | * Setups the EEPROM for reading and writing. |
@@ -348,7 +348,7 @@ out: | |||
348 | } | 348 | } |
349 | 349 | ||
350 | /** | 350 | /** |
351 | * e1000_read_nvm_eerd - Reads EEPROM using EERD register | 351 | * igb_read_nvm_eerd - Reads EEPROM using EERD register |
352 | * @hw: pointer to the HW structure | 352 | * @hw: pointer to the HW structure |
353 | * @offset: offset of word in the EEPROM to read | 353 | * @offset: offset of word in the EEPROM to read |
354 | * @words: number of words to read | 354 | * @words: number of words to read |
@@ -391,7 +391,7 @@ out: | |||
391 | } | 391 | } |
392 | 392 | ||
393 | /** | 393 | /** |
394 | * e1000_write_nvm_spi - Write to EEPROM using SPI | 394 | * igb_write_nvm_spi - Write to EEPROM using SPI |
395 | * @hw: pointer to the HW structure | 395 | * @hw: pointer to the HW structure |
396 | * @offset: offset within the EEPROM to be written to | 396 | * @offset: offset within the EEPROM to be written to |
397 | * @words: number of words to write | 397 | * @words: number of words to write |
@@ -475,7 +475,7 @@ out: | |||
475 | } | 475 | } |
476 | 476 | ||
477 | /** | 477 | /** |
478 | * e1000_read_part_num - Read device part number | 478 | * igb_read_part_num - Read device part number |
479 | * @hw: pointer to the HW structure | 479 | * @hw: pointer to the HW structure |
480 | * @part_num: pointer to device part number | 480 | * @part_num: pointer to device part number |
481 | * | 481 | * |
@@ -506,7 +506,7 @@ out: | |||
506 | } | 506 | } |
507 | 507 | ||
508 | /** | 508 | /** |
509 | * e1000_read_mac_addr - Read device MAC address | 509 | * igb_read_mac_addr - Read device MAC address |
510 | * @hw: pointer to the HW structure | 510 | * @hw: pointer to the HW structure |
511 | * | 511 | * |
512 | * Reads the device MAC address from the EEPROM and stores the value. | 512 | * Reads the device MAC address from the EEPROM and stores the value. |
@@ -541,7 +541,7 @@ out: | |||
541 | } | 541 | } |
542 | 542 | ||
543 | /** | 543 | /** |
544 | * e1000_validate_nvm_checksum - Validate EEPROM checksum | 544 | * igb_validate_nvm_checksum - Validate EEPROM checksum |
545 | * @hw: pointer to the HW structure | 545 | * @hw: pointer to the HW structure |
546 | * | 546 | * |
547 | * Calculates the EEPROM checksum by reading/adding each word of the EEPROM | 547 | * Calculates the EEPROM checksum by reading/adding each word of the EEPROM |
@@ -573,7 +573,7 @@ out: | |||
573 | } | 573 | } |
574 | 574 | ||
575 | /** | 575 | /** |
576 | * e1000_update_nvm_checksum - Update EEPROM checksum | 576 | * igb_update_nvm_checksum - Update EEPROM checksum |
577 | * @hw: pointer to the HW structure | 577 | * @hw: pointer to the HW structure |
578 | * | 578 | * |
579 | * Updates the EEPROM checksum by reading/adding each word of the EEPROM | 579 | * Updates the EEPROM checksum by reading/adding each word of the EEPROM |
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c index 08a86b107229..220e4716da9e 100644 --- a/drivers/net/igb/e1000_phy.c +++ b/drivers/net/igb/e1000_phy.c | |||
@@ -61,7 +61,7 @@ static const u16 e1000_igp_2_cable_length_table[] = | |||
61 | sizeof(e1000_igp_2_cable_length_table[0])) | 61 | sizeof(e1000_igp_2_cable_length_table[0])) |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * e1000_check_reset_block - Check if PHY reset is blocked | 64 | * igb_check_reset_block - Check if PHY reset is blocked |
65 | * @hw: pointer to the HW structure | 65 | * @hw: pointer to the HW structure |
66 | * | 66 | * |
67 | * Read the PHY management control register and check whether a PHY reset | 67 | * Read the PHY management control register and check whether a PHY reset |
@@ -79,7 +79,7 @@ s32 igb_check_reset_block(struct e1000_hw *hw) | |||
79 | } | 79 | } |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * e1000_get_phy_id - Retrieve the PHY ID and revision | 82 | * igb_get_phy_id - Retrieve the PHY ID and revision |
83 | * @hw: pointer to the HW structure | 83 | * @hw: pointer to the HW structure |
84 | * | 84 | * |
85 | * Reads the PHY registers and stores the PHY ID and possibly the PHY | 85 | * Reads the PHY registers and stores the PHY ID and possibly the PHY |
@@ -109,7 +109,7 @@ out: | |||
109 | } | 109 | } |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * e1000_phy_reset_dsp - Reset PHY DSP | 112 | * igb_phy_reset_dsp - Reset PHY DSP |
113 | * @hw: pointer to the HW structure | 113 | * @hw: pointer to the HW structure |
114 | * | 114 | * |
115 | * Reset the digital signal processor. | 115 | * Reset the digital signal processor. |
@@ -129,7 +129,7 @@ out: | |||
129 | } | 129 | } |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * e1000_read_phy_reg_mdic - Read MDI control register | 132 | * igb_read_phy_reg_mdic - Read MDI control register |
133 | * @hw: pointer to the HW structure | 133 | * @hw: pointer to the HW structure |
134 | * @offset: register offset to be read | 134 | * @offset: register offset to be read |
135 | * @data: pointer to the read data | 135 | * @data: pointer to the read data |
@@ -188,7 +188,7 @@ out: | |||
188 | } | 188 | } |
189 | 189 | ||
190 | /** | 190 | /** |
191 | * e1000_write_phy_reg_mdic - Write MDI control register | 191 | * igb_write_phy_reg_mdic - Write MDI control register |
192 | * @hw: pointer to the HW structure | 192 | * @hw: pointer to the HW structure |
193 | * @offset: register offset to write to | 193 | * @offset: register offset to write to |
194 | * @data: data to write to register at offset | 194 | * @data: data to write to register at offset |
@@ -246,7 +246,7 @@ out: | |||
246 | } | 246 | } |
247 | 247 | ||
248 | /** | 248 | /** |
249 | * e1000_read_phy_reg_igp - Read igp PHY register | 249 | * igb_read_phy_reg_igp - Read igp PHY register |
250 | * @hw: pointer to the HW structure | 250 | * @hw: pointer to the HW structure |
251 | * @offset: register offset to be read | 251 | * @offset: register offset to be read |
252 | * @data: pointer to the read data | 252 | * @data: pointer to the read data |
@@ -284,7 +284,7 @@ out: | |||
284 | } | 284 | } |
285 | 285 | ||
286 | /** | 286 | /** |
287 | * e1000_write_phy_reg_igp - Write igp PHY register | 287 | * igb_write_phy_reg_igp - Write igp PHY register |
288 | * @hw: pointer to the HW structure | 288 | * @hw: pointer to the HW structure |
289 | * @offset: register offset to write to | 289 | * @offset: register offset to write to |
290 | * @data: data to write at register offset | 290 | * @data: data to write at register offset |
@@ -321,7 +321,7 @@ out: | |||
321 | } | 321 | } |
322 | 322 | ||
323 | /** | 323 | /** |
324 | * e1000_copper_link_setup_m88 - Setup m88 PHY's for copper link | 324 | * igb_copper_link_setup_m88 - Setup m88 PHY's for copper link |
325 | * @hw: pointer to the HW structure | 325 | * @hw: pointer to the HW structure |
326 | * | 326 | * |
327 | * Sets up MDI/MDI-X and polarity for m88 PHY's. If necessary, transmit clock | 327 | * Sets up MDI/MDI-X and polarity for m88 PHY's. If necessary, transmit clock |
@@ -432,7 +432,7 @@ out: | |||
432 | } | 432 | } |
433 | 433 | ||
434 | /** | 434 | /** |
435 | * e1000_copper_link_setup_igp - Setup igp PHY's for copper link | 435 | * igb_copper_link_setup_igp - Setup igp PHY's for copper link |
436 | * @hw: pointer to the HW structure | 436 | * @hw: pointer to the HW structure |
437 | * | 437 | * |
438 | * Sets up LPLU, MDI/MDI-X, polarity, Smartspeed and Master/Slave config for | 438 | * Sets up LPLU, MDI/MDI-X, polarity, Smartspeed and Master/Slave config for |
@@ -570,7 +570,7 @@ out: | |||
570 | } | 570 | } |
571 | 571 | ||
572 | /** | 572 | /** |
573 | * e1000_copper_link_autoneg - Setup/Enable autoneg for copper link | 573 | * igb_copper_link_autoneg - Setup/Enable autoneg for copper link |
574 | * @hw: pointer to the HW structure | 574 | * @hw: pointer to the HW structure |
575 | * | 575 | * |
576 | * Performs initial bounds checking on autoneg advertisement parameter, then | 576 | * Performs initial bounds checking on autoneg advertisement parameter, then |
@@ -638,7 +638,7 @@ out: | |||
638 | } | 638 | } |
639 | 639 | ||
640 | /** | 640 | /** |
641 | * e1000_phy_setup_autoneg - Configure PHY for auto-negotiation | 641 | * igb_phy_setup_autoneg - Configure PHY for auto-negotiation |
642 | * @hw: pointer to the HW structure | 642 | * @hw: pointer to the HW structure |
643 | * | 643 | * |
644 | * Reads the MII auto-neg advertisement register and/or the 1000T control | 644 | * Reads the MII auto-neg advertisement register and/or the 1000T control |
@@ -805,7 +805,7 @@ out: | |||
805 | } | 805 | } |
806 | 806 | ||
807 | /** | 807 | /** |
808 | * e1000_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY | 808 | * igb_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY |
809 | * @hw: pointer to the HW structure | 809 | * @hw: pointer to the HW structure |
810 | * | 810 | * |
811 | * Calls the PHY setup function to force speed and duplex. Clears the | 811 | * Calls the PHY setup function to force speed and duplex. Clears the |
@@ -878,7 +878,7 @@ out: | |||
878 | } | 878 | } |
879 | 879 | ||
880 | /** | 880 | /** |
881 | * e1000_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY | 881 | * igb_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY |
882 | * @hw: pointer to the HW structure | 882 | * @hw: pointer to the HW structure |
883 | * | 883 | * |
884 | * Calls the PHY setup function to force speed and duplex. Clears the | 884 | * Calls the PHY setup function to force speed and duplex. Clears the |
@@ -993,7 +993,7 @@ out: | |||
993 | } | 993 | } |
994 | 994 | ||
995 | /** | 995 | /** |
996 | * e1000_phy_force_speed_duplex_setup - Configure forced PHY speed/duplex | 996 | * igb_phy_force_speed_duplex_setup - Configure forced PHY speed/duplex |
997 | * @hw: pointer to the HW structure | 997 | * @hw: pointer to the HW structure |
998 | * @phy_ctrl: pointer to current value of PHY_CONTROL | 998 | * @phy_ctrl: pointer to current value of PHY_CONTROL |
999 | * | 999 | * |
@@ -1054,7 +1054,7 @@ static void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw, | |||
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | /** | 1056 | /** |
1057 | * e1000_set_d3_lplu_state - Sets low power link up state for D3 | 1057 | * igb_set_d3_lplu_state - Sets low power link up state for D3 |
1058 | * @hw: pointer to the HW structure | 1058 | * @hw: pointer to the HW structure |
1059 | * @active: boolean used to enable/disable lplu | 1059 | * @active: boolean used to enable/disable lplu |
1060 | * | 1060 | * |
@@ -1146,7 +1146,7 @@ out: | |||
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | /** | 1148 | /** |
1149 | * e1000_check_downshift - Checks whether a downshift in speed occured | 1149 | * igb_check_downshift - Checks whether a downshift in speed occured |
1150 | * @hw: pointer to the HW structure | 1150 | * @hw: pointer to the HW structure |
1151 | * | 1151 | * |
1152 | * Success returns 0, Failure returns 1 | 1152 | * Success returns 0, Failure returns 1 |
@@ -1188,7 +1188,7 @@ out: | |||
1188 | } | 1188 | } |
1189 | 1189 | ||
1190 | /** | 1190 | /** |
1191 | * e1000_check_polarity_m88 - Checks the polarity. | 1191 | * igb_check_polarity_m88 - Checks the polarity. |
1192 | * @hw: pointer to the HW structure | 1192 | * @hw: pointer to the HW structure |
1193 | * | 1193 | * |
1194 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) | 1194 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) |
@@ -1212,7 +1212,7 @@ static s32 igb_check_polarity_m88(struct e1000_hw *hw) | |||
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | /** | 1214 | /** |
1215 | * e1000_check_polarity_igp - Checks the polarity. | 1215 | * igb_check_polarity_igp - Checks the polarity. |
1216 | * @hw: pointer to the HW structure | 1216 | * @hw: pointer to the HW structure |
1217 | * | 1217 | * |
1218 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) | 1218 | * Success returns 0, Failure returns -E1000_ERR_PHY (-2) |
@@ -1260,7 +1260,7 @@ out: | |||
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /** | 1262 | /** |
1263 | * e1000_wait_autoneg - Wait for auto-neg compeletion | 1263 | * igb_wait_autoneg - Wait for auto-neg compeletion |
1264 | * @hw: pointer to the HW structure | 1264 | * @hw: pointer to the HW structure |
1265 | * | 1265 | * |
1266 | * Waits for auto-negotiation to complete or for the auto-negotiation time | 1266 | * Waits for auto-negotiation to complete or for the auto-negotiation time |
@@ -1292,7 +1292,7 @@ static s32 igb_wait_autoneg(struct e1000_hw *hw) | |||
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | /** | 1294 | /** |
1295 | * e1000_phy_has_link - Polls PHY for link | 1295 | * igb_phy_has_link - Polls PHY for link |
1296 | * @hw: pointer to the HW structure | 1296 | * @hw: pointer to the HW structure |
1297 | * @iterations: number of times to poll for link | 1297 | * @iterations: number of times to poll for link |
1298 | * @usec_interval: delay between polling attempts | 1298 | * @usec_interval: delay between polling attempts |
@@ -1332,7 +1332,7 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations, | |||
1332 | } | 1332 | } |
1333 | 1333 | ||
1334 | /** | 1334 | /** |
1335 | * e1000_get_cable_length_m88 - Determine cable length for m88 PHY | 1335 | * igb_get_cable_length_m88 - Determine cable length for m88 PHY |
1336 | * @hw: pointer to the HW structure | 1336 | * @hw: pointer to the HW structure |
1337 | * | 1337 | * |
1338 | * Reads the PHY specific status register to retrieve the cable length | 1338 | * Reads the PHY specific status register to retrieve the cable length |
@@ -1369,7 +1369,7 @@ out: | |||
1369 | } | 1369 | } |
1370 | 1370 | ||
1371 | /** | 1371 | /** |
1372 | * e1000_get_cable_length_igp_2 - Determine cable length for igp2 PHY | 1372 | * igb_get_cable_length_igp_2 - Determine cable length for igp2 PHY |
1373 | * @hw: pointer to the HW structure | 1373 | * @hw: pointer to the HW structure |
1374 | * | 1374 | * |
1375 | * The automatic gain control (agc) normalizes the amplitude of the | 1375 | * The automatic gain control (agc) normalizes the amplitude of the |
@@ -1442,7 +1442,7 @@ out: | |||
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | /** | 1444 | /** |
1445 | * e1000_get_phy_info_m88 - Retrieve PHY information | 1445 | * igb_get_phy_info_m88 - Retrieve PHY information |
1446 | * @hw: pointer to the HW structure | 1446 | * @hw: pointer to the HW structure |
1447 | * | 1447 | * |
1448 | * Valid for only copper links. Read the PHY status register (sticky read) | 1448 | * Valid for only copper links. Read the PHY status register (sticky read) |
@@ -1523,7 +1523,7 @@ out: | |||
1523 | } | 1523 | } |
1524 | 1524 | ||
1525 | /** | 1525 | /** |
1526 | * e1000_get_phy_info_igp - Retrieve igp PHY information | 1526 | * igb_get_phy_info_igp - Retrieve igp PHY information |
1527 | * @hw: pointer to the HW structure | 1527 | * @hw: pointer to the HW structure |
1528 | * | 1528 | * |
1529 | * Read PHY status to determine if link is up. If link is up, then | 1529 | * Read PHY status to determine if link is up. If link is up, then |
@@ -1590,7 +1590,7 @@ out: | |||
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | /** | 1592 | /** |
1593 | * e1000_phy_sw_reset - PHY software reset | 1593 | * igb_phy_sw_reset - PHY software reset |
1594 | * @hw: pointer to the HW structure | 1594 | * @hw: pointer to the HW structure |
1595 | * | 1595 | * |
1596 | * Does a software reset of the PHY by reading the PHY control register and | 1596 | * Does a software reset of the PHY by reading the PHY control register and |
@@ -1617,7 +1617,7 @@ out: | |||
1617 | } | 1617 | } |
1618 | 1618 | ||
1619 | /** | 1619 | /** |
1620 | * e1000_phy_hw_reset - PHY hardware reset | 1620 | * igb_phy_hw_reset - PHY hardware reset |
1621 | * @hw: pointer to the HW structure | 1621 | * @hw: pointer to the HW structure |
1622 | * | 1622 | * |
1623 | * Verify the reset block is not blocking us from resetting. Acquire | 1623 | * Verify the reset block is not blocking us from resetting. Acquire |
@@ -1663,7 +1663,7 @@ out: | |||
1663 | /* Internal function pointers */ | 1663 | /* Internal function pointers */ |
1664 | 1664 | ||
1665 | /** | 1665 | /** |
1666 | * e1000_get_phy_cfg_done - Generic PHY configuration done | 1666 | * igb_get_phy_cfg_done - Generic PHY configuration done |
1667 | * @hw: pointer to the HW structure | 1667 | * @hw: pointer to the HW structure |
1668 | * | 1668 | * |
1669 | * Return success if silicon family did not implement a family specific | 1669 | * Return success if silicon family did not implement a family specific |
@@ -1678,7 +1678,7 @@ static s32 igb_get_phy_cfg_done(struct e1000_hw *hw) | |||
1678 | } | 1678 | } |
1679 | 1679 | ||
1680 | /** | 1680 | /** |
1681 | * e1000_release_phy - Generic release PHY | 1681 | * igb_release_phy - Generic release PHY |
1682 | * @hw: pointer to the HW structure | 1682 | * @hw: pointer to the HW structure |
1683 | * | 1683 | * |
1684 | * Return if silicon family does not require a semaphore when accessing the | 1684 | * Return if silicon family does not require a semaphore when accessing the |
@@ -1691,7 +1691,7 @@ static void igb_release_phy(struct e1000_hw *hw) | |||
1691 | } | 1691 | } |
1692 | 1692 | ||
1693 | /** | 1693 | /** |
1694 | * e1000_acquire_phy - Generic acquire PHY | 1694 | * igb_acquire_phy - Generic acquire PHY |
1695 | * @hw: pointer to the HW structure | 1695 | * @hw: pointer to the HW structure |
1696 | * | 1696 | * |
1697 | * Return success if silicon family does not require a semaphore when | 1697 | * Return success if silicon family does not require a semaphore when |
@@ -1706,7 +1706,7 @@ static s32 igb_acquire_phy(struct e1000_hw *hw) | |||
1706 | } | 1706 | } |
1707 | 1707 | ||
1708 | /** | 1708 | /** |
1709 | * e1000_phy_force_speed_duplex - Generic force PHY speed/duplex | 1709 | * igb_phy_force_speed_duplex - Generic force PHY speed/duplex |
1710 | * @hw: pointer to the HW structure | 1710 | * @hw: pointer to the HW structure |
1711 | * | 1711 | * |
1712 | * When the silicon family has not implemented a forced speed/duplex | 1712 | * When the silicon family has not implemented a forced speed/duplex |
@@ -1721,7 +1721,7 @@ s32 igb_phy_force_speed_duplex(struct e1000_hw *hw) | |||
1721 | } | 1721 | } |
1722 | 1722 | ||
1723 | /** | 1723 | /** |
1724 | * e1000_phy_init_script_igp3 - Inits the IGP3 PHY | 1724 | * igb_phy_init_script_igp3 - Inits the IGP3 PHY |
1725 | * @hw: pointer to the HW structure | 1725 | * @hw: pointer to the HW structure |
1726 | * | 1726 | * |
1727 | * Initializes a Intel Gigabit PHY3 when an EEPROM is not present. | 1727 | * Initializes a Intel Gigabit PHY3 when an EEPROM is not present. |