diff options
44 files changed, 378 insertions, 410 deletions
diff --git a/drivers/net/ethernet/3com/3c501.c b/drivers/net/ethernet/3com/3c501.c index bf73e1a02293..2038eaabaea4 100644 --- a/drivers/net/ethernet/3com/3c501.c +++ b/drivers/net/ethernet/3com/3c501.c | |||
@@ -143,7 +143,7 @@ static int irq = 5; | |||
143 | static int mem_start; | 143 | static int mem_start; |
144 | 144 | ||
145 | /** | 145 | /** |
146 | * el1_probe: - probe for a 3c501 | 146 | * el1_probe - probe for a 3c501 |
147 | * @dev: The device structure passed in to probe. | 147 | * @dev: The device structure passed in to probe. |
148 | * | 148 | * |
149 | * This can be called from two places. The network layer will probe using | 149 | * This can be called from two places. The network layer will probe using |
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 85717cb306d1..42c13d8280c6 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -166,7 +166,7 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag) | |||
166 | msleep(5); | 166 | msleep(5); |
167 | } | 167 | } |
168 | 168 | ||
169 | /* | 169 | /** |
170 | * atl1c_irq_enable - Enable default interrupt generation settings | 170 | * atl1c_irq_enable - Enable default interrupt generation settings |
171 | * @adapter: board private structure | 171 | * @adapter: board private structure |
172 | */ | 172 | */ |
@@ -179,7 +179,7 @@ static inline void atl1c_irq_enable(struct atl1c_adapter *adapter) | |||
179 | } | 179 | } |
180 | } | 180 | } |
181 | 181 | ||
182 | /* | 182 | /** |
183 | * atl1c_irq_disable - Mask off interrupt generation on the NIC | 183 | * atl1c_irq_disable - Mask off interrupt generation on the NIC |
184 | * @adapter: board private structure | 184 | * @adapter: board private structure |
185 | */ | 185 | */ |
@@ -192,7 +192,7 @@ static inline void atl1c_irq_disable(struct atl1c_adapter *adapter) | |||
192 | synchronize_irq(adapter->pdev->irq); | 192 | synchronize_irq(adapter->pdev->irq); |
193 | } | 193 | } |
194 | 194 | ||
195 | /* | 195 | /** |
196 | * atl1c_irq_reset - reset interrupt confiure on the NIC | 196 | * atl1c_irq_reset - reset interrupt confiure on the NIC |
197 | * @adapter: board private structure | 197 | * @adapter: board private structure |
198 | */ | 198 | */ |
@@ -220,7 +220,7 @@ static u32 atl1c_wait_until_idle(struct atl1c_hw *hw, u32 modu_ctrl) | |||
220 | return data; | 220 | return data; |
221 | } | 221 | } |
222 | 222 | ||
223 | /* | 223 | /** |
224 | * atl1c_phy_config - Timer Call-back | 224 | * atl1c_phy_config - Timer Call-back |
225 | * @data: pointer to netdev cast into an unsigned long | 225 | * @data: pointer to netdev cast into an unsigned long |
226 | */ | 226 | */ |
@@ -361,7 +361,7 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter) | |||
361 | } | 361 | } |
362 | 362 | ||
363 | 363 | ||
364 | /* | 364 | /** |
365 | * atl1c_tx_timeout - Respond to a Tx Hang | 365 | * atl1c_tx_timeout - Respond to a Tx Hang |
366 | * @netdev: network interface device structure | 366 | * @netdev: network interface device structure |
367 | */ | 367 | */ |
@@ -374,7 +374,7 @@ static void atl1c_tx_timeout(struct net_device *netdev) | |||
374 | schedule_work(&adapter->common_task); | 374 | schedule_work(&adapter->common_task); |
375 | } | 375 | } |
376 | 376 | ||
377 | /* | 377 | /** |
378 | * atl1c_set_multi - Multicast and Promiscuous mode set | 378 | * atl1c_set_multi - Multicast and Promiscuous mode set |
379 | * @netdev: network interface device structure | 379 | * @netdev: network interface device structure |
380 | * | 380 | * |
@@ -453,7 +453,7 @@ static void atl1c_restore_vlan(struct atl1c_adapter *adapter) | |||
453 | atl1c_vlan_mode(adapter->netdev, adapter->netdev->features); | 453 | atl1c_vlan_mode(adapter->netdev, adapter->netdev->features); |
454 | } | 454 | } |
455 | 455 | ||
456 | /* | 456 | /** |
457 | * atl1c_set_mac - Change the Ethernet Address of the NIC | 457 | * atl1c_set_mac - Change the Ethernet Address of the NIC |
458 | * @netdev: network interface device structure | 458 | * @netdev: network interface device structure |
459 | * @p: pointer to an address structure | 459 | * @p: pointer to an address structure |
@@ -518,7 +518,7 @@ static int atl1c_set_features(struct net_device *netdev, | |||
518 | return 0; | 518 | return 0; |
519 | } | 519 | } |
520 | 520 | ||
521 | /* | 521 | /** |
522 | * atl1c_change_mtu - Change the Maximum Transfer Unit | 522 | * atl1c_change_mtu - Change the Maximum Transfer Unit |
523 | * @netdev: network interface device structure | 523 | * @netdev: network interface device structure |
524 | * @new_mtu: new value for maximum frame size | 524 | * @new_mtu: new value for maximum frame size |
@@ -577,12 +577,6 @@ static void atl1c_mdio_write(struct net_device *netdev, int phy_id, | |||
577 | atl1c_write_phy_reg(&adapter->hw, reg_num, val); | 577 | atl1c_write_phy_reg(&adapter->hw, reg_num, val); |
578 | } | 578 | } |
579 | 579 | ||
580 | /* | ||
581 | * atl1c_mii_ioctl - | ||
582 | * @netdev: | ||
583 | * @ifreq: | ||
584 | * @cmd: | ||
585 | */ | ||
586 | static int atl1c_mii_ioctl(struct net_device *netdev, | 580 | static int atl1c_mii_ioctl(struct net_device *netdev, |
587 | struct ifreq *ifr, int cmd) | 581 | struct ifreq *ifr, int cmd) |
588 | { | 582 | { |
@@ -633,12 +627,6 @@ out: | |||
633 | return retval; | 627 | return retval; |
634 | } | 628 | } |
635 | 629 | ||
636 | /* | ||
637 | * atl1c_ioctl - | ||
638 | * @netdev: | ||
639 | * @ifreq: | ||
640 | * @cmd: | ||
641 | */ | ||
642 | static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 630 | static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
643 | { | 631 | { |
644 | switch (cmd) { | 632 | switch (cmd) { |
@@ -651,7 +639,7 @@ static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
651 | } | 639 | } |
652 | } | 640 | } |
653 | 641 | ||
654 | /* | 642 | /** |
655 | * atl1c_alloc_queues - Allocate memory for all rings | 643 | * atl1c_alloc_queues - Allocate memory for all rings |
656 | * @adapter: board private structure to initialize | 644 | * @adapter: board private structure to initialize |
657 | * | 645 | * |
@@ -755,7 +743,7 @@ static void __devinit atl1c_patch_assign(struct atl1c_hw *hw) | |||
755 | i++; | 743 | i++; |
756 | } | 744 | } |
757 | } | 745 | } |
758 | /* | 746 | /** |
759 | * atl1c_sw_init - Initialize general software structures (struct atl1c_adapter) | 747 | * atl1c_sw_init - Initialize general software structures (struct atl1c_adapter) |
760 | * @adapter: board private structure to initialize | 748 | * @adapter: board private structure to initialize |
761 | * | 749 | * |
@@ -853,7 +841,7 @@ static inline void atl1c_clean_buffer(struct pci_dev *pdev, | |||
853 | buffer_info->skb = NULL; | 841 | buffer_info->skb = NULL; |
854 | ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE); | 842 | ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE); |
855 | } | 843 | } |
856 | /* | 844 | /** |
857 | * atl1c_clean_tx_ring - Free Tx-skb | 845 | * atl1c_clean_tx_ring - Free Tx-skb |
858 | * @adapter: board private structure | 846 | * @adapter: board private structure |
859 | */ | 847 | */ |
@@ -878,7 +866,7 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter, | |||
878 | tpd_ring->next_to_use = 0; | 866 | tpd_ring->next_to_use = 0; |
879 | } | 867 | } |
880 | 868 | ||
881 | /* | 869 | /** |
882 | * atl1c_clean_rx_ring - Free rx-reservation skbs | 870 | * atl1c_clean_rx_ring - Free rx-reservation skbs |
883 | * @adapter: board private structure | 871 | * @adapter: board private structure |
884 | */ | 872 | */ |
@@ -931,7 +919,7 @@ static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter) | |||
931 | } | 919 | } |
932 | } | 920 | } |
933 | 921 | ||
934 | /* | 922 | /** |
935 | * atl1c_free_ring_resources - Free Tx / RX descriptor Resources | 923 | * atl1c_free_ring_resources - Free Tx / RX descriptor Resources |
936 | * @adapter: board private structure | 924 | * @adapter: board private structure |
937 | * | 925 | * |
@@ -954,7 +942,7 @@ static void atl1c_free_ring_resources(struct atl1c_adapter *adapter) | |||
954 | } | 942 | } |
955 | } | 943 | } |
956 | 944 | ||
957 | /* | 945 | /** |
958 | * atl1c_setup_mem_resources - allocate Tx / RX descriptor resources | 946 | * atl1c_setup_mem_resources - allocate Tx / RX descriptor resources |
959 | * @adapter: board private structure | 947 | * @adapter: board private structure |
960 | * | 948 | * |
@@ -1363,7 +1351,7 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed) | |||
1363 | return; | 1351 | return; |
1364 | } | 1352 | } |
1365 | 1353 | ||
1366 | /* | 1354 | /** |
1367 | * atl1c_configure - Configure Transmit&Receive Unit after Reset | 1355 | * atl1c_configure - Configure Transmit&Receive Unit after Reset |
1368 | * @adapter: board private structure | 1356 | * @adapter: board private structure |
1369 | * | 1357 | * |
@@ -1477,7 +1465,7 @@ static void atl1c_update_hw_stats(struct atl1c_adapter *adapter) | |||
1477 | } | 1465 | } |
1478 | } | 1466 | } |
1479 | 1467 | ||
1480 | /* | 1468 | /** |
1481 | * atl1c_get_stats - Get System Network Statistics | 1469 | * atl1c_get_stats - Get System Network Statistics |
1482 | * @netdev: network interface device structure | 1470 | * @netdev: network interface device structure |
1483 | * | 1471 | * |
@@ -1558,11 +1546,10 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter, | |||
1558 | return true; | 1546 | return true; |
1559 | } | 1547 | } |
1560 | 1548 | ||
1561 | /* | 1549 | /** |
1562 | * atl1c_intr - Interrupt Handler | 1550 | * atl1c_intr - Interrupt Handler |
1563 | * @irq: interrupt number | 1551 | * @irq: interrupt number |
1564 | * @data: pointer to a network interface device structure | 1552 | * @data: pointer to a network interface device structure |
1565 | * @pt_regs: CPU registers structure | ||
1566 | */ | 1553 | */ |
1567 | static irqreturn_t atl1c_intr(int irq, void *data) | 1554 | static irqreturn_t atl1c_intr(int irq, void *data) |
1568 | { | 1555 | { |
@@ -1813,9 +1800,8 @@ rrs_checked: | |||
1813 | atl1c_alloc_rx_buffer(adapter); | 1800 | atl1c_alloc_rx_buffer(adapter); |
1814 | } | 1801 | } |
1815 | 1802 | ||
1816 | /* | 1803 | /** |
1817 | * atl1c_clean - NAPI Rx polling callback | 1804 | * atl1c_clean - NAPI Rx polling callback |
1818 | * @adapter: board private structure | ||
1819 | */ | 1805 | */ |
1820 | static int atl1c_clean(struct napi_struct *napi, int budget) | 1806 | static int atl1c_clean(struct napi_struct *napi, int budget) |
1821 | { | 1807 | { |
@@ -2270,7 +2256,7 @@ static void atl1c_down(struct atl1c_adapter *adapter) | |||
2270 | atl1c_reset_dma_ring(adapter); | 2256 | atl1c_reset_dma_ring(adapter); |
2271 | } | 2257 | } |
2272 | 2258 | ||
2273 | /* | 2259 | /** |
2274 | * atl1c_open - Called when a network interface is made active | 2260 | * atl1c_open - Called when a network interface is made active |
2275 | * @netdev: network interface device structure | 2261 | * @netdev: network interface device structure |
2276 | * | 2262 | * |
@@ -2309,7 +2295,7 @@ err_up: | |||
2309 | return err; | 2295 | return err; |
2310 | } | 2296 | } |
2311 | 2297 | ||
2312 | /* | 2298 | /** |
2313 | * atl1c_close - Disables a network interface | 2299 | * atl1c_close - Disables a network interface |
2314 | * @netdev: network interface device structure | 2300 | * @netdev: network interface device structure |
2315 | * | 2301 | * |
@@ -2432,7 +2418,7 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev) | |||
2432 | return 0; | 2418 | return 0; |
2433 | } | 2419 | } |
2434 | 2420 | ||
2435 | /* | 2421 | /** |
2436 | * atl1c_probe - Device Initialization Routine | 2422 | * atl1c_probe - Device Initialization Routine |
2437 | * @pdev: PCI device information struct | 2423 | * @pdev: PCI device information struct |
2438 | * @ent: entry in atl1c_pci_tbl | 2424 | * @ent: entry in atl1c_pci_tbl |
@@ -2579,7 +2565,7 @@ err_dma: | |||
2579 | return err; | 2565 | return err; |
2580 | } | 2566 | } |
2581 | 2567 | ||
2582 | /* | 2568 | /** |
2583 | * atl1c_remove - Device Removal Routine | 2569 | * atl1c_remove - Device Removal Routine |
2584 | * @pdev: PCI device information struct | 2570 | * @pdev: PCI device information struct |
2585 | * | 2571 | * |
@@ -2605,7 +2591,7 @@ static void __devexit atl1c_remove(struct pci_dev *pdev) | |||
2605 | free_netdev(netdev); | 2591 | free_netdev(netdev); |
2606 | } | 2592 | } |
2607 | 2593 | ||
2608 | /* | 2594 | /** |
2609 | * atl1c_io_error_detected - called when PCI error is detected | 2595 | * atl1c_io_error_detected - called when PCI error is detected |
2610 | * @pdev: Pointer to PCI device | 2596 | * @pdev: Pointer to PCI device |
2611 | * @state: The current pci connection state | 2597 | * @state: The current pci connection state |
@@ -2633,7 +2619,7 @@ static pci_ers_result_t atl1c_io_error_detected(struct pci_dev *pdev, | |||
2633 | return PCI_ERS_RESULT_NEED_RESET; | 2619 | return PCI_ERS_RESULT_NEED_RESET; |
2634 | } | 2620 | } |
2635 | 2621 | ||
2636 | /* | 2622 | /** |
2637 | * atl1c_io_slot_reset - called after the pci bus has been reset. | 2623 | * atl1c_io_slot_reset - called after the pci bus has been reset. |
2638 | * @pdev: Pointer to PCI device | 2624 | * @pdev: Pointer to PCI device |
2639 | * | 2625 | * |
@@ -2661,7 +2647,7 @@ static pci_ers_result_t atl1c_io_slot_reset(struct pci_dev *pdev) | |||
2661 | return PCI_ERS_RESULT_RECOVERED; | 2647 | return PCI_ERS_RESULT_RECOVERED; |
2662 | } | 2648 | } |
2663 | 2649 | ||
2664 | /* | 2650 | /** |
2665 | * atl1c_io_resume - called when traffic can start flowing again. | 2651 | * atl1c_io_resume - called when traffic can start flowing again. |
2666 | * @pdev: Pointer to PCI device | 2652 | * @pdev: Pointer to PCI device |
2667 | * | 2653 | * |
@@ -2704,7 +2690,7 @@ static struct pci_driver atl1c_driver = { | |||
2704 | .driver.pm = &atl1c_pm_ops, | 2690 | .driver.pm = &atl1c_pm_ops, |
2705 | }; | 2691 | }; |
2706 | 2692 | ||
2707 | /* | 2693 | /** |
2708 | * atl1c_init_module - Driver Registration Routine | 2694 | * atl1c_init_module - Driver Registration Routine |
2709 | * | 2695 | * |
2710 | * atl1c_init_module is the first routine called when the driver is | 2696 | * atl1c_init_module is the first routine called when the driver is |
@@ -2715,7 +2701,7 @@ static int __init atl1c_init_module(void) | |||
2715 | return pci_register_driver(&atl1c_driver); | 2701 | return pci_register_driver(&atl1c_driver); |
2716 | } | 2702 | } |
2717 | 2703 | ||
2718 | /* | 2704 | /** |
2719 | * atl1c_exit_module - Driver Exit Cleanup Routine | 2705 | * atl1c_exit_module - Driver Exit Cleanup Routine |
2720 | * | 2706 | * |
2721 | * atl1c_exit_module is called just before the driver is removed | 2707 | * atl1c_exit_module is called just before the driver is removed |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 0aed82e1bb3e..a98acc8a956f 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |||
@@ -89,7 +89,7 @@ static const u16 atl1e_pay_load_size[] = { | |||
89 | 128, 256, 512, 1024, 2048, 4096, | 89 | 128, 256, 512, 1024, 2048, 4096, |
90 | }; | 90 | }; |
91 | 91 | ||
92 | /* | 92 | /** |
93 | * atl1e_irq_enable - Enable default interrupt generation settings | 93 | * atl1e_irq_enable - Enable default interrupt generation settings |
94 | * @adapter: board private structure | 94 | * @adapter: board private structure |
95 | */ | 95 | */ |
@@ -102,7 +102,7 @@ static inline void atl1e_irq_enable(struct atl1e_adapter *adapter) | |||
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
105 | /* | 105 | /** |
106 | * atl1e_irq_disable - Mask off interrupt generation on the NIC | 106 | * atl1e_irq_disable - Mask off interrupt generation on the NIC |
107 | * @adapter: board private structure | 107 | * @adapter: board private structure |
108 | */ | 108 | */ |
@@ -114,7 +114,7 @@ static inline void atl1e_irq_disable(struct atl1e_adapter *adapter) | |||
114 | synchronize_irq(adapter->pdev->irq); | 114 | synchronize_irq(adapter->pdev->irq); |
115 | } | 115 | } |
116 | 116 | ||
117 | /* | 117 | /** |
118 | * atl1e_irq_reset - reset interrupt confiure on the NIC | 118 | * atl1e_irq_reset - reset interrupt confiure on the NIC |
119 | * @adapter: board private structure | 119 | * @adapter: board private structure |
120 | */ | 120 | */ |
@@ -126,7 +126,7 @@ static inline void atl1e_irq_reset(struct atl1e_adapter *adapter) | |||
126 | AT_WRITE_FLUSH(&adapter->hw); | 126 | AT_WRITE_FLUSH(&adapter->hw); |
127 | } | 127 | } |
128 | 128 | ||
129 | /* | 129 | /** |
130 | * atl1e_phy_config - Timer Call-back | 130 | * atl1e_phy_config - Timer Call-back |
131 | * @data: pointer to netdev cast into an unsigned long | 131 | * @data: pointer to netdev cast into an unsigned long |
132 | */ | 132 | */ |
@@ -210,7 +210,7 @@ static int atl1e_check_link(struct atl1e_adapter *adapter) | |||
210 | return 0; | 210 | return 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | /* | 213 | /** |
214 | * atl1e_link_chg_task - deal with link change event Out of interrupt context | 214 | * atl1e_link_chg_task - deal with link change event Out of interrupt context |
215 | * @netdev: network interface device structure | 215 | * @netdev: network interface device structure |
216 | */ | 216 | */ |
@@ -259,7 +259,7 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter) | |||
259 | cancel_work_sync(&adapter->link_chg_task); | 259 | cancel_work_sync(&adapter->link_chg_task); |
260 | } | 260 | } |
261 | 261 | ||
262 | /* | 262 | /** |
263 | * atl1e_tx_timeout - Respond to a Tx Hang | 263 | * atl1e_tx_timeout - Respond to a Tx Hang |
264 | * @netdev: network interface device structure | 264 | * @netdev: network interface device structure |
265 | */ | 265 | */ |
@@ -271,7 +271,7 @@ static void atl1e_tx_timeout(struct net_device *netdev) | |||
271 | schedule_work(&adapter->reset_task); | 271 | schedule_work(&adapter->reset_task); |
272 | } | 272 | } |
273 | 273 | ||
274 | /* | 274 | /** |
275 | * atl1e_set_multi - Multicast and Promiscuous mode set | 275 | * atl1e_set_multi - Multicast and Promiscuous mode set |
276 | * @netdev: network interface device structure | 276 | * @netdev: network interface device structure |
277 | * | 277 | * |
@@ -345,7 +345,7 @@ static void atl1e_restore_vlan(struct atl1e_adapter *adapter) | |||
345 | atl1e_vlan_mode(adapter->netdev, adapter->netdev->features); | 345 | atl1e_vlan_mode(adapter->netdev, adapter->netdev->features); |
346 | } | 346 | } |
347 | 347 | ||
348 | /* | 348 | /** |
349 | * atl1e_set_mac - Change the Ethernet Address of the NIC | 349 | * atl1e_set_mac - Change the Ethernet Address of the NIC |
350 | * @netdev: network interface device structure | 350 | * @netdev: network interface device structure |
351 | * @p: pointer to an address structure | 351 | * @p: pointer to an address structure |
@@ -397,7 +397,7 @@ static int atl1e_set_features(struct net_device *netdev, | |||
397 | return 0; | 397 | return 0; |
398 | } | 398 | } |
399 | 399 | ||
400 | /* | 400 | /** |
401 | * atl1e_change_mtu - Change the Maximum Transfer Unit | 401 | * atl1e_change_mtu - Change the Maximum Transfer Unit |
402 | * @netdev: network interface device structure | 402 | * @netdev: network interface device structure |
403 | * @new_mtu: new value for maximum frame size | 403 | * @new_mtu: new value for maximum frame size |
@@ -449,12 +449,6 @@ static void atl1e_mdio_write(struct net_device *netdev, int phy_id, | |||
449 | atl1e_write_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, val); | 449 | atl1e_write_phy_reg(&adapter->hw, reg_num & MDIO_REG_ADDR_MASK, val); |
450 | } | 450 | } |
451 | 451 | ||
452 | /* | ||
453 | * atl1e_mii_ioctl - | ||
454 | * @netdev: | ||
455 | * @ifreq: | ||
456 | * @cmd: | ||
457 | */ | ||
458 | static int atl1e_mii_ioctl(struct net_device *netdev, | 452 | static int atl1e_mii_ioctl(struct net_device *netdev, |
459 | struct ifreq *ifr, int cmd) | 453 | struct ifreq *ifr, int cmd) |
460 | { | 454 | { |
@@ -505,12 +499,6 @@ out: | |||
505 | 499 | ||
506 | } | 500 | } |
507 | 501 | ||
508 | /* | ||
509 | * atl1e_ioctl - | ||
510 | * @netdev: | ||
511 | * @ifreq: | ||
512 | * @cmd: | ||
513 | */ | ||
514 | static int atl1e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 502 | static int atl1e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
515 | { | 503 | { |
516 | switch (cmd) { | 504 | switch (cmd) { |
@@ -541,7 +529,7 @@ static void atl1e_setup_pcicmd(struct pci_dev *pdev) | |||
541 | msleep(1); | 529 | msleep(1); |
542 | } | 530 | } |
543 | 531 | ||
544 | /* | 532 | /** |
545 | * atl1e_alloc_queues - Allocate memory for all rings | 533 | * atl1e_alloc_queues - Allocate memory for all rings |
546 | * @adapter: board private structure to initialize | 534 | * @adapter: board private structure to initialize |
547 | * | 535 | * |
@@ -551,7 +539,7 @@ static int __devinit atl1e_alloc_queues(struct atl1e_adapter *adapter) | |||
551 | return 0; | 539 | return 0; |
552 | } | 540 | } |
553 | 541 | ||
554 | /* | 542 | /** |
555 | * atl1e_sw_init - Initialize general software structures (struct atl1e_adapter) | 543 | * atl1e_sw_init - Initialize general software structures (struct atl1e_adapter) |
556 | * @adapter: board private structure to initialize | 544 | * @adapter: board private structure to initialize |
557 | * | 545 | * |
@@ -635,7 +623,7 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter) | |||
635 | return 0; | 623 | return 0; |
636 | } | 624 | } |
637 | 625 | ||
638 | /* | 626 | /** |
639 | * atl1e_clean_tx_ring - Free Tx-skb | 627 | * atl1e_clean_tx_ring - Free Tx-skb |
640 | * @adapter: board private structure | 628 | * @adapter: board private structure |
641 | */ | 629 | */ |
@@ -678,7 +666,7 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter) | |||
678 | ring_count); | 666 | ring_count); |
679 | } | 667 | } |
680 | 668 | ||
681 | /* | 669 | /** |
682 | * atl1e_clean_rx_ring - Free rx-reservation skbs | 670 | * atl1e_clean_rx_ring - Free rx-reservation skbs |
683 | * @adapter: board private structure | 671 | * @adapter: board private structure |
684 | */ | 672 | */ |
@@ -761,7 +749,7 @@ static void atl1e_init_ring_ptrs(struct atl1e_adapter *adapter) | |||
761 | } | 749 | } |
762 | } | 750 | } |
763 | 751 | ||
764 | /* | 752 | /** |
765 | * atl1e_free_ring_resources - Free Tx / RX descriptor Resources | 753 | * atl1e_free_ring_resources - Free Tx / RX descriptor Resources |
766 | * @adapter: board private structure | 754 | * @adapter: board private structure |
767 | * | 755 | * |
@@ -786,7 +774,7 @@ static void atl1e_free_ring_resources(struct atl1e_adapter *adapter) | |||
786 | } | 774 | } |
787 | } | 775 | } |
788 | 776 | ||
789 | /* | 777 | /** |
790 | * atl1e_setup_mem_resources - allocate Tx / RX descriptor resources | 778 | * atl1e_setup_mem_resources - allocate Tx / RX descriptor resources |
791 | * @adapter: board private structure | 779 | * @adapter: board private structure |
792 | * | 780 | * |
@@ -1075,7 +1063,7 @@ static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) | |||
1075 | AT_WRITE_REG(hw, REG_MAC_CTRL, value); | 1063 | AT_WRITE_REG(hw, REG_MAC_CTRL, value); |
1076 | } | 1064 | } |
1077 | 1065 | ||
1078 | /* | 1066 | /** |
1079 | * atl1e_configure - Configure Transmit&Receive Unit after Reset | 1067 | * atl1e_configure - Configure Transmit&Receive Unit after Reset |
1080 | * @adapter: board private structure | 1068 | * @adapter: board private structure |
1081 | * | 1069 | * |
@@ -1145,7 +1133,7 @@ static int atl1e_configure(struct atl1e_adapter *adapter) | |||
1145 | return 0; | 1133 | return 0; |
1146 | } | 1134 | } |
1147 | 1135 | ||
1148 | /* | 1136 | /** |
1149 | * atl1e_get_stats - Get System Network Statistics | 1137 | * atl1e_get_stats - Get System Network Statistics |
1150 | * @netdev: network interface device structure | 1138 | * @netdev: network interface device structure |
1151 | * | 1139 | * |
@@ -1257,11 +1245,10 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter) | |||
1257 | return true; | 1245 | return true; |
1258 | } | 1246 | } |
1259 | 1247 | ||
1260 | /* | 1248 | /** |
1261 | * atl1e_intr - Interrupt Handler | 1249 | * atl1e_intr - Interrupt Handler |
1262 | * @irq: interrupt number | 1250 | * @irq: interrupt number |
1263 | * @data: pointer to a network interface device structure | 1251 | * @data: pointer to a network interface device structure |
1264 | * @pt_regs: CPU registers structure | ||
1265 | */ | 1252 | */ |
1266 | static irqreturn_t atl1e_intr(int irq, void *data) | 1253 | static irqreturn_t atl1e_intr(int irq, void *data) |
1267 | { | 1254 | { |
@@ -1489,9 +1476,8 @@ fatal_err: | |||
1489 | schedule_work(&adapter->reset_task); | 1476 | schedule_work(&adapter->reset_task); |
1490 | } | 1477 | } |
1491 | 1478 | ||
1492 | /* | 1479 | /** |
1493 | * atl1e_clean - NAPI Rx polling callback | 1480 | * atl1e_clean - NAPI Rx polling callback |
1494 | * @adapter: board private structure | ||
1495 | */ | 1481 | */ |
1496 | static int atl1e_clean(struct napi_struct *napi, int budget) | 1482 | static int atl1e_clean(struct napi_struct *napi, int budget) |
1497 | { | 1483 | { |
@@ -1956,7 +1942,7 @@ void atl1e_down(struct atl1e_adapter *adapter) | |||
1956 | atl1e_clean_rx_ring(adapter); | 1942 | atl1e_clean_rx_ring(adapter); |
1957 | } | 1943 | } |
1958 | 1944 | ||
1959 | /* | 1945 | /** |
1960 | * atl1e_open - Called when a network interface is made active | 1946 | * atl1e_open - Called when a network interface is made active |
1961 | * @netdev: network interface device structure | 1947 | * @netdev: network interface device structure |
1962 | * | 1948 | * |
@@ -2002,7 +1988,7 @@ err_req_irq: | |||
2002 | return err; | 1988 | return err; |
2003 | } | 1989 | } |
2004 | 1990 | ||
2005 | /* | 1991 | /** |
2006 | * atl1e_close - Disables a network interface | 1992 | * atl1e_close - Disables a network interface |
2007 | * @netdev: network interface device structure | 1993 | * @netdev: network interface device structure |
2008 | * | 1994 | * |
@@ -2238,7 +2224,7 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev) | |||
2238 | return 0; | 2224 | return 0; |
2239 | } | 2225 | } |
2240 | 2226 | ||
2241 | /* | 2227 | /** |
2242 | * atl1e_probe - Device Initialization Routine | 2228 | * atl1e_probe - Device Initialization Routine |
2243 | * @pdev: PCI device information struct | 2229 | * @pdev: PCI device information struct |
2244 | * @ent: entry in atl1e_pci_tbl | 2230 | * @ent: entry in atl1e_pci_tbl |
@@ -2392,7 +2378,7 @@ err_dma: | |||
2392 | return err; | 2378 | return err; |
2393 | } | 2379 | } |
2394 | 2380 | ||
2395 | /* | 2381 | /** |
2396 | * atl1e_remove - Device Removal Routine | 2382 | * atl1e_remove - Device Removal Routine |
2397 | * @pdev: PCI device information struct | 2383 | * @pdev: PCI device information struct |
2398 | * | 2384 | * |
@@ -2424,7 +2410,7 @@ static void __devexit atl1e_remove(struct pci_dev *pdev) | |||
2424 | pci_disable_device(pdev); | 2410 | pci_disable_device(pdev); |
2425 | } | 2411 | } |
2426 | 2412 | ||
2427 | /* | 2413 | /** |
2428 | * atl1e_io_error_detected - called when PCI error is detected | 2414 | * atl1e_io_error_detected - called when PCI error is detected |
2429 | * @pdev: Pointer to PCI device | 2415 | * @pdev: Pointer to PCI device |
2430 | * @state: The current pci connection state | 2416 | * @state: The current pci connection state |
@@ -2452,7 +2438,7 @@ atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) | |||
2452 | return PCI_ERS_RESULT_NEED_RESET; | 2438 | return PCI_ERS_RESULT_NEED_RESET; |
2453 | } | 2439 | } |
2454 | 2440 | ||
2455 | /* | 2441 | /** |
2456 | * atl1e_io_slot_reset - called after the pci bus has been reset. | 2442 | * atl1e_io_slot_reset - called after the pci bus has been reset. |
2457 | * @pdev: Pointer to PCI device | 2443 | * @pdev: Pointer to PCI device |
2458 | * | 2444 | * |
@@ -2479,7 +2465,7 @@ static pci_ers_result_t atl1e_io_slot_reset(struct pci_dev *pdev) | |||
2479 | return PCI_ERS_RESULT_RECOVERED; | 2465 | return PCI_ERS_RESULT_RECOVERED; |
2480 | } | 2466 | } |
2481 | 2467 | ||
2482 | /* | 2468 | /** |
2483 | * atl1e_io_resume - called when traffic can start flowing again. | 2469 | * atl1e_io_resume - called when traffic can start flowing again. |
2484 | * @pdev: Pointer to PCI device | 2470 | * @pdev: Pointer to PCI device |
2485 | * | 2471 | * |
@@ -2523,7 +2509,7 @@ static struct pci_driver atl1e_driver = { | |||
2523 | .err_handler = &atl1e_err_handler | 2509 | .err_handler = &atl1e_err_handler |
2524 | }; | 2510 | }; |
2525 | 2511 | ||
2526 | /* | 2512 | /** |
2527 | * atl1e_init_module - Driver Registration Routine | 2513 | * atl1e_init_module - Driver Registration Routine |
2528 | * | 2514 | * |
2529 | * atl1e_init_module is the first routine called when the driver is | 2515 | * atl1e_init_module is the first routine called when the driver is |
@@ -2534,7 +2520,7 @@ static int __init atl1e_init_module(void) | |||
2534 | return pci_register_driver(&atl1e_driver); | 2520 | return pci_register_driver(&atl1e_driver); |
2535 | } | 2521 | } |
2536 | 2522 | ||
2537 | /* | 2523 | /** |
2538 | * atl1e_exit_module - Driver Exit Cleanup Routine | 2524 | * atl1e_exit_module - Driver Exit Cleanup Routine |
2539 | * | 2525 | * |
2540 | * atl1e_exit_module is called just before the driver is removed | 2526 | * atl1e_exit_module is called just before the driver is removed |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c index 0ce60b6e7ef0..b5086f1e637f 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c | |||
@@ -168,7 +168,7 @@ static int __devinit atl1e_validate_option(int *value, struct atl1e_option *opt, | |||
168 | return -1; | 168 | return -1; |
169 | } | 169 | } |
170 | 170 | ||
171 | /* | 171 | /** |
172 | * atl1e_check_options - Range Checking for Command Line Parameters | 172 | * atl1e_check_options - Range Checking for Command Line Parameters |
173 | * @adapter: board private structure | 173 | * @adapter: board private structure |
174 | * | 174 | * |
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 149a294d54e9..f2402f355cec 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -195,7 +195,7 @@ static int __devinit atl1_validate_option(int *value, struct atl1_option *opt, | |||
195 | return -1; | 195 | return -1; |
196 | } | 196 | } |
197 | 197 | ||
198 | /* | 198 | /** |
199 | * atl1_check_options - Range Checking for Command Line Parameters | 199 | * atl1_check_options - Range Checking for Command Line Parameters |
200 | * @adapter: board private structure | 200 | * @adapter: board private structure |
201 | * | 201 | * |
@@ -937,7 +937,7 @@ static void atl1_set_mac_addr(struct atl1_hw *hw) | |||
937 | iowrite32(value, (hw->hw_addr + REG_MAC_STA_ADDR) + (1 << 2)); | 937 | iowrite32(value, (hw->hw_addr + REG_MAC_STA_ADDR) + (1 << 2)); |
938 | } | 938 | } |
939 | 939 | ||
940 | /* | 940 | /** |
941 | * atl1_sw_init - Initialize general software structures (struct atl1_adapter) | 941 | * atl1_sw_init - Initialize general software structures (struct atl1_adapter) |
942 | * @adapter: board private structure to initialize | 942 | * @adapter: board private structure to initialize |
943 | * | 943 | * |
@@ -1014,12 +1014,6 @@ static void mdio_write(struct net_device *netdev, int phy_id, int reg_num, | |||
1014 | atl1_write_phy_reg(&adapter->hw, reg_num, val); | 1014 | atl1_write_phy_reg(&adapter->hw, reg_num, val); |
1015 | } | 1015 | } |
1016 | 1016 | ||
1017 | /* | ||
1018 | * atl1_mii_ioctl - | ||
1019 | * @netdev: | ||
1020 | * @ifreq: | ||
1021 | * @cmd: | ||
1022 | */ | ||
1023 | static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 1017 | static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
1024 | { | 1018 | { |
1025 | struct atl1_adapter *adapter = netdev_priv(netdev); | 1019 | struct atl1_adapter *adapter = netdev_priv(netdev); |
@@ -1036,7 +1030,7 @@ static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
1036 | return retval; | 1030 | return retval; |
1037 | } | 1031 | } |
1038 | 1032 | ||
1039 | /* | 1033 | /** |
1040 | * atl1_setup_mem_resources - allocate Tx / RX descriptor resources | 1034 | * atl1_setup_mem_resources - allocate Tx / RX descriptor resources |
1041 | * @adapter: board private structure | 1035 | * @adapter: board private structure |
1042 | * | 1036 | * |
@@ -1147,7 +1141,7 @@ static void atl1_init_ring_ptrs(struct atl1_adapter *adapter) | |||
1147 | atomic_set(&rrd_ring->next_to_clean, 0); | 1141 | atomic_set(&rrd_ring->next_to_clean, 0); |
1148 | } | 1142 | } |
1149 | 1143 | ||
1150 | /* | 1144 | /** |
1151 | * atl1_clean_rx_ring - Free RFD Buffers | 1145 | * atl1_clean_rx_ring - Free RFD Buffers |
1152 | * @adapter: board private structure | 1146 | * @adapter: board private structure |
1153 | */ | 1147 | */ |
@@ -1187,7 +1181,7 @@ static void atl1_clean_rx_ring(struct atl1_adapter *adapter) | |||
1187 | atomic_set(&rrd_ring->next_to_clean, 0); | 1181 | atomic_set(&rrd_ring->next_to_clean, 0); |
1188 | } | 1182 | } |
1189 | 1183 | ||
1190 | /* | 1184 | /** |
1191 | * atl1_clean_tx_ring - Free Tx Buffers | 1185 | * atl1_clean_tx_ring - Free Tx Buffers |
1192 | * @adapter: board private structure | 1186 | * @adapter: board private structure |
1193 | */ | 1187 | */ |
@@ -1227,7 +1221,7 @@ static void atl1_clean_tx_ring(struct atl1_adapter *adapter) | |||
1227 | atomic_set(&tpd_ring->next_to_clean, 0); | 1221 | atomic_set(&tpd_ring->next_to_clean, 0); |
1228 | } | 1222 | } |
1229 | 1223 | ||
1230 | /* | 1224 | /** |
1231 | * atl1_free_ring_resources - Free Tx / RX descriptor Resources | 1225 | * atl1_free_ring_resources - Free Tx / RX descriptor Resources |
1232 | * @adapter: board private structure | 1226 | * @adapter: board private structure |
1233 | * | 1227 | * |
@@ -1470,7 +1464,7 @@ static void set_flow_ctrl_new(struct atl1_hw *hw) | |||
1470 | iowrite32(value, hw->hw_addr + REG_RXQ_RRD_PAUSE_THRESH); | 1464 | iowrite32(value, hw->hw_addr + REG_RXQ_RRD_PAUSE_THRESH); |
1471 | } | 1465 | } |
1472 | 1466 | ||
1473 | /* | 1467 | /** |
1474 | * atl1_configure - Configure Transmit&Receive Unit after Reset | 1468 | * atl1_configure - Configure Transmit&Receive Unit after Reset |
1475 | * @adapter: board private structure | 1469 | * @adapter: board private structure |
1476 | * | 1470 | * |
@@ -1844,7 +1838,7 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter, | |||
1844 | } | 1838 | } |
1845 | } | 1839 | } |
1846 | 1840 | ||
1847 | /* | 1841 | /** |
1848 | * atl1_alloc_rx_buffers - Replace used receive buffers | 1842 | * atl1_alloc_rx_buffers - Replace used receive buffers |
1849 | * @adapter: address of board private structure | 1843 | * @adapter: address of board private structure |
1850 | */ | 1844 | */ |
@@ -2489,11 +2483,10 @@ static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter) | |||
2489 | return 1; | 2483 | return 1; |
2490 | } | 2484 | } |
2491 | 2485 | ||
2492 | /* | 2486 | /** |
2493 | * atl1_intr - Interrupt Handler | 2487 | * atl1_intr - Interrupt Handler |
2494 | * @irq: interrupt number | 2488 | * @irq: interrupt number |
2495 | * @data: pointer to a network interface device structure | 2489 | * @data: pointer to a network interface device structure |
2496 | * @pt_regs: CPU registers structure | ||
2497 | */ | 2490 | */ |
2498 | static irqreturn_t atl1_intr(int irq, void *data) | 2491 | static irqreturn_t atl1_intr(int irq, void *data) |
2499 | { | 2492 | { |
@@ -2574,7 +2567,7 @@ static irqreturn_t atl1_intr(int irq, void *data) | |||
2574 | } | 2567 | } |
2575 | 2568 | ||
2576 | 2569 | ||
2577 | /* | 2570 | /** |
2578 | * atl1_phy_config - Timer Call-back | 2571 | * atl1_phy_config - Timer Call-back |
2579 | * @data: pointer to netdev cast into an unsigned long | 2572 | * @data: pointer to netdev cast into an unsigned long |
2580 | */ | 2573 | */ |
@@ -2693,7 +2686,7 @@ static void atl1_reset_dev_task(struct work_struct *work) | |||
2693 | netif_device_attach(netdev); | 2686 | netif_device_attach(netdev); |
2694 | } | 2687 | } |
2695 | 2688 | ||
2696 | /* | 2689 | /** |
2697 | * atl1_change_mtu - Change the Maximum Transfer Unit | 2690 | * atl1_change_mtu - Change the Maximum Transfer Unit |
2698 | * @netdev: network interface device structure | 2691 | * @netdev: network interface device structure |
2699 | * @new_mtu: new value for maximum frame size | 2692 | * @new_mtu: new value for maximum frame size |
@@ -2727,7 +2720,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu) | |||
2727 | return 0; | 2720 | return 0; |
2728 | } | 2721 | } |
2729 | 2722 | ||
2730 | /* | 2723 | /** |
2731 | * atl1_open - Called when a network interface is made active | 2724 | * atl1_open - Called when a network interface is made active |
2732 | * @netdev: network interface device structure | 2725 | * @netdev: network interface device structure |
2733 | * | 2726 | * |
@@ -2762,7 +2755,7 @@ err_up: | |||
2762 | return err; | 2755 | return err; |
2763 | } | 2756 | } |
2764 | 2757 | ||
2765 | /* | 2758 | /** |
2766 | * atl1_close - Disables a network interface | 2759 | * atl1_close - Disables a network interface |
2767 | * @netdev: network interface device structure | 2760 | * @netdev: network interface device structure |
2768 | * | 2761 | * |
@@ -2930,7 +2923,7 @@ static const struct net_device_ops atl1_netdev_ops = { | |||
2930 | #endif | 2923 | #endif |
2931 | }; | 2924 | }; |
2932 | 2925 | ||
2933 | /* | 2926 | /** |
2934 | * atl1_probe - Device Initialization Routine | 2927 | * atl1_probe - Device Initialization Routine |
2935 | * @pdev: PCI device information struct | 2928 | * @pdev: PCI device information struct |
2936 | * @ent: entry in atl1_pci_tbl | 2929 | * @ent: entry in atl1_pci_tbl |
@@ -3111,7 +3104,7 @@ err_request_regions: | |||
3111 | return err; | 3104 | return err; |
3112 | } | 3105 | } |
3113 | 3106 | ||
3114 | /* | 3107 | /** |
3115 | * atl1_remove - Device Removal Routine | 3108 | * atl1_remove - Device Removal Routine |
3116 | * @pdev: PCI device information struct | 3109 | * @pdev: PCI device information struct |
3117 | * | 3110 | * |
@@ -3158,7 +3151,7 @@ static struct pci_driver atl1_driver = { | |||
3158 | .driver.pm = ATL1_PM_OPS, | 3151 | .driver.pm = ATL1_PM_OPS, |
3159 | }; | 3152 | }; |
3160 | 3153 | ||
3161 | /* | 3154 | /** |
3162 | * atl1_exit_module - Driver Exit Cleanup Routine | 3155 | * atl1_exit_module - Driver Exit Cleanup Routine |
3163 | * | 3156 | * |
3164 | * atl1_exit_module is called just before the driver is removed | 3157 | * atl1_exit_module is called just before the driver is removed |
@@ -3169,7 +3162,7 @@ static void __exit atl1_exit_module(void) | |||
3169 | pci_unregister_driver(&atl1_driver); | 3162 | pci_unregister_driver(&atl1_driver); |
3170 | } | 3163 | } |
3171 | 3164 | ||
3172 | /* | 3165 | /** |
3173 | * atl1_init_module - Driver Registration Routine | 3166 | * atl1_init_module - Driver Registration Routine |
3174 | * | 3167 | * |
3175 | * atl1_init_module is the first routine called when the driver is | 3168 | * atl1_init_module is the first routine called when the driver is |
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 6762dc406b25..7c0b7e2bcb66 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c | |||
@@ -75,7 +75,7 @@ static void atl2_set_ethtool_ops(struct net_device *netdev); | |||
75 | 75 | ||
76 | static void atl2_check_options(struct atl2_adapter *adapter); | 76 | static void atl2_check_options(struct atl2_adapter *adapter); |
77 | 77 | ||
78 | /* | 78 | /** |
79 | * atl2_sw_init - Initialize general software structures (struct atl2_adapter) | 79 | * atl2_sw_init - Initialize general software structures (struct atl2_adapter) |
80 | * @adapter: board private structure to initialize | 80 | * @adapter: board private structure to initialize |
81 | * | 81 | * |
@@ -123,7 +123,7 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter) | |||
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
125 | 125 | ||
126 | /* | 126 | /** |
127 | * atl2_set_multi - Multicast and Promiscuous mode set | 127 | * atl2_set_multi - Multicast and Promiscuous mode set |
128 | * @netdev: network interface device structure | 128 | * @netdev: network interface device structure |
129 | * | 129 | * |
@@ -177,7 +177,7 @@ static void init_ring_ptrs(struct atl2_adapter *adapter) | |||
177 | adapter->txs_next_clear = 0; | 177 | adapter->txs_next_clear = 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | /* | 180 | /** |
181 | * atl2_configure - Configure Transmit&Receive Unit after Reset | 181 | * atl2_configure - Configure Transmit&Receive Unit after Reset |
182 | * @adapter: board private structure | 182 | * @adapter: board private structure |
183 | * | 183 | * |
@@ -283,7 +283,7 @@ static int atl2_configure(struct atl2_adapter *adapter) | |||
283 | return value; | 283 | return value; |
284 | } | 284 | } |
285 | 285 | ||
286 | /* | 286 | /** |
287 | * atl2_setup_ring_resources - allocate Tx / RX descriptor resources | 287 | * atl2_setup_ring_resources - allocate Tx / RX descriptor resources |
288 | * @adapter: board private structure | 288 | * @adapter: board private structure |
289 | * | 289 | * |
@@ -340,7 +340,7 @@ static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter) | |||
340 | return 0; | 340 | return 0; |
341 | } | 341 | } |
342 | 342 | ||
343 | /* | 343 | /** |
344 | * atl2_irq_enable - Enable default interrupt generation settings | 344 | * atl2_irq_enable - Enable default interrupt generation settings |
345 | * @adapter: board private structure | 345 | * @adapter: board private structure |
346 | */ | 346 | */ |
@@ -350,7 +350,7 @@ static inline void atl2_irq_enable(struct atl2_adapter *adapter) | |||
350 | ATL2_WRITE_FLUSH(&adapter->hw); | 350 | ATL2_WRITE_FLUSH(&adapter->hw); |
351 | } | 351 | } |
352 | 352 | ||
353 | /* | 353 | /** |
354 | * atl2_irq_disable - Mask off interrupt generation on the NIC | 354 | * atl2_irq_disable - Mask off interrupt generation on the NIC |
355 | * @adapter: board private structure | 355 | * @adapter: board private structure |
356 | */ | 356 | */ |
@@ -599,11 +599,10 @@ static inline void atl2_clear_phy_int(struct atl2_adapter *adapter) | |||
599 | spin_unlock(&adapter->stats_lock); | 599 | spin_unlock(&adapter->stats_lock); |
600 | } | 600 | } |
601 | 601 | ||
602 | /* | 602 | /** |
603 | * atl2_intr - Interrupt Handler | 603 | * atl2_intr - Interrupt Handler |
604 | * @irq: interrupt number | 604 | * @irq: interrupt number |
605 | * @data: pointer to a network interface device structure | 605 | * @data: pointer to a network interface device structure |
606 | * @pt_regs: CPU registers structure | ||
607 | */ | 606 | */ |
608 | static irqreturn_t atl2_intr(int irq, void *data) | 607 | static irqreturn_t atl2_intr(int irq, void *data) |
609 | { | 608 | { |
@@ -679,7 +678,7 @@ static int atl2_request_irq(struct atl2_adapter *adapter) | |||
679 | netdev); | 678 | netdev); |
680 | } | 679 | } |
681 | 680 | ||
682 | /* | 681 | /** |
683 | * atl2_free_ring_resources - Free Tx / RX descriptor Resources | 682 | * atl2_free_ring_resources - Free Tx / RX descriptor Resources |
684 | * @adapter: board private structure | 683 | * @adapter: board private structure |
685 | * | 684 | * |
@@ -692,7 +691,7 @@ static void atl2_free_ring_resources(struct atl2_adapter *adapter) | |||
692 | adapter->ring_dma); | 691 | adapter->ring_dma); |
693 | } | 692 | } |
694 | 693 | ||
695 | /* | 694 | /** |
696 | * atl2_open - Called when a network interface is made active | 695 | * atl2_open - Called when a network interface is made active |
697 | * @netdev: network interface device structure | 696 | * @netdev: network interface device structure |
698 | * | 697 | * |
@@ -798,7 +797,7 @@ static void atl2_free_irq(struct atl2_adapter *adapter) | |||
798 | #endif | 797 | #endif |
799 | } | 798 | } |
800 | 799 | ||
801 | /* | 800 | /** |
802 | * atl2_close - Disables a network interface | 801 | * atl2_close - Disables a network interface |
803 | * @netdev: network interface device structure | 802 | * @netdev: network interface device structure |
804 | * | 803 | * |
@@ -918,7 +917,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb, | |||
918 | return NETDEV_TX_OK; | 917 | return NETDEV_TX_OK; |
919 | } | 918 | } |
920 | 919 | ||
921 | /* | 920 | /** |
922 | * atl2_change_mtu - Change the Maximum Transfer Unit | 921 | * atl2_change_mtu - Change the Maximum Transfer Unit |
923 | * @netdev: network interface device structure | 922 | * @netdev: network interface device structure |
924 | * @new_mtu: new value for maximum frame size | 923 | * @new_mtu: new value for maximum frame size |
@@ -943,7 +942,7 @@ static int atl2_change_mtu(struct net_device *netdev, int new_mtu) | |||
943 | return 0; | 942 | return 0; |
944 | } | 943 | } |
945 | 944 | ||
946 | /* | 945 | /** |
947 | * atl2_set_mac - Change the Ethernet Address of the NIC | 946 | * atl2_set_mac - Change the Ethernet Address of the NIC |
948 | * @netdev: network interface device structure | 947 | * @netdev: network interface device structure |
949 | * @p: pointer to an address structure | 948 | * @p: pointer to an address structure |
@@ -969,12 +968,6 @@ static int atl2_set_mac(struct net_device *netdev, void *p) | |||
969 | return 0; | 968 | return 0; |
970 | } | 969 | } |
971 | 970 | ||
972 | /* | ||
973 | * atl2_mii_ioctl - | ||
974 | * @netdev: | ||
975 | * @ifreq: | ||
976 | * @cmd: | ||
977 | */ | ||
978 | static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 971 | static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
979 | { | 972 | { |
980 | struct atl2_adapter *adapter = netdev_priv(netdev); | 973 | struct atl2_adapter *adapter = netdev_priv(netdev); |
@@ -1011,12 +1004,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
1011 | return 0; | 1004 | return 0; |
1012 | } | 1005 | } |
1013 | 1006 | ||
1014 | /* | ||
1015 | * atl2_ioctl - | ||
1016 | * @netdev: | ||
1017 | * @ifreq: | ||
1018 | * @cmd: | ||
1019 | */ | ||
1020 | static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 1007 | static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
1021 | { | 1008 | { |
1022 | switch (cmd) { | 1009 | switch (cmd) { |
@@ -1033,7 +1020,7 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
1033 | } | 1020 | } |
1034 | } | 1021 | } |
1035 | 1022 | ||
1036 | /* | 1023 | /** |
1037 | * atl2_tx_timeout - Respond to a Tx Hang | 1024 | * atl2_tx_timeout - Respond to a Tx Hang |
1038 | * @netdev: network interface device structure | 1025 | * @netdev: network interface device structure |
1039 | */ | 1026 | */ |
@@ -1045,7 +1032,7 @@ static void atl2_tx_timeout(struct net_device *netdev) | |||
1045 | schedule_work(&adapter->reset_task); | 1032 | schedule_work(&adapter->reset_task); |
1046 | } | 1033 | } |
1047 | 1034 | ||
1048 | /* | 1035 | /** |
1049 | * atl2_watchdog - Timer Call-back | 1036 | * atl2_watchdog - Timer Call-back |
1050 | * @data: pointer to netdev cast into an unsigned long | 1037 | * @data: pointer to netdev cast into an unsigned long |
1051 | */ | 1038 | */ |
@@ -1070,7 +1057,7 @@ static void atl2_watchdog(unsigned long data) | |||
1070 | } | 1057 | } |
1071 | } | 1058 | } |
1072 | 1059 | ||
1073 | /* | 1060 | /** |
1074 | * atl2_phy_config - Timer Call-back | 1061 | * atl2_phy_config - Timer Call-back |
1075 | * @data: pointer to netdev cast into an unsigned long | 1062 | * @data: pointer to netdev cast into an unsigned long |
1076 | */ | 1063 | */ |
@@ -1274,9 +1261,8 @@ static int atl2_check_link(struct atl2_adapter *adapter) | |||
1274 | return 0; | 1261 | return 0; |
1275 | } | 1262 | } |
1276 | 1263 | ||
1277 | /* | 1264 | /** |
1278 | * atl2_link_chg_task - deal with link change event Out of interrupt context | 1265 | * atl2_link_chg_task - deal with link change event Out of interrupt context |
1279 | * @netdev: network interface device structure | ||
1280 | */ | 1266 | */ |
1281 | static void atl2_link_chg_task(struct work_struct *work) | 1267 | static void atl2_link_chg_task(struct work_struct *work) |
1282 | { | 1268 | { |
@@ -1341,7 +1327,7 @@ static const struct net_device_ops atl2_netdev_ops = { | |||
1341 | #endif | 1327 | #endif |
1342 | }; | 1328 | }; |
1343 | 1329 | ||
1344 | /* | 1330 | /** |
1345 | * atl2_probe - Device Initialization Routine | 1331 | * atl2_probe - Device Initialization Routine |
1346 | * @pdev: PCI device information struct | 1332 | * @pdev: PCI device information struct |
1347 | * @ent: entry in atl2_pci_tbl | 1333 | * @ent: entry in atl2_pci_tbl |
@@ -1501,7 +1487,7 @@ err_dma: | |||
1501 | return err; | 1487 | return err; |
1502 | } | 1488 | } |
1503 | 1489 | ||
1504 | /* | 1490 | /** |
1505 | * atl2_remove - Device Removal Routine | 1491 | * atl2_remove - Device Removal Routine |
1506 | * @pdev: PCI device information struct | 1492 | * @pdev: PCI device information struct |
1507 | * | 1493 | * |
@@ -1728,7 +1714,7 @@ static struct pci_driver atl2_driver = { | |||
1728 | .shutdown = atl2_shutdown, | 1714 | .shutdown = atl2_shutdown, |
1729 | }; | 1715 | }; |
1730 | 1716 | ||
1731 | /* | 1717 | /** |
1732 | * atl2_init_module - Driver Registration Routine | 1718 | * atl2_init_module - Driver Registration Routine |
1733 | * | 1719 | * |
1734 | * atl2_init_module is the first routine called when the driver is | 1720 | * atl2_init_module is the first routine called when the driver is |
@@ -1743,7 +1729,7 @@ static int __init atl2_init_module(void) | |||
1743 | } | 1729 | } |
1744 | module_init(atl2_init_module); | 1730 | module_init(atl2_init_module); |
1745 | 1731 | ||
1746 | /* | 1732 | /** |
1747 | * atl2_exit_module - Driver Exit Cleanup Routine | 1733 | * atl2_exit_module - Driver Exit Cleanup Routine |
1748 | * | 1734 | * |
1749 | * atl2_exit_module is called just before the driver is removed | 1735 | * atl2_exit_module is called just before the driver is removed |
@@ -2997,7 +2983,7 @@ static int __devinit atl2_validate_option(int *value, struct atl2_option *opt) | |||
2997 | return -1; | 2983 | return -1; |
2998 | } | 2984 | } |
2999 | 2985 | ||
3000 | /* | 2986 | /** |
3001 | * atl2_check_options - Range Checking for Command Line Parameters | 2987 | * atl2_check_options - Range Checking for Command Line Parameters |
3002 | * @adapter: board private structure | 2988 | * @adapter: board private structure |
3003 | * | 2989 | * |
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c index b4f3aa49a7fc..77ffbc4a5071 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c | |||
@@ -64,7 +64,7 @@ static int atlx_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | /* | 67 | /** |
68 | * atlx_set_mac - Change the Ethernet Address of the NIC | 68 | * atlx_set_mac - Change the Ethernet Address of the NIC |
69 | * @netdev: network interface device structure | 69 | * @netdev: network interface device structure |
70 | * @p: pointer to an address structure | 70 | * @p: pointer to an address structure |
@@ -115,7 +115,7 @@ static void atlx_check_for_link(struct atlx_adapter *adapter) | |||
115 | schedule_work(&adapter->link_chg_task); | 115 | schedule_work(&adapter->link_chg_task); |
116 | } | 116 | } |
117 | 117 | ||
118 | /* | 118 | /** |
119 | * atlx_set_multi - Multicast and Promiscuous mode set | 119 | * atlx_set_multi - Multicast and Promiscuous mode set |
120 | * @netdev: network interface device structure | 120 | * @netdev: network interface device structure |
121 | * | 121 | * |
@@ -162,7 +162,7 @@ static inline void atlx_imr_set(struct atlx_adapter *adapter, | |||
162 | ioread32(adapter->hw.hw_addr + REG_IMR); | 162 | ioread32(adapter->hw.hw_addr + REG_IMR); |
163 | } | 163 | } |
164 | 164 | ||
165 | /* | 165 | /** |
166 | * atlx_irq_enable - Enable default interrupt generation settings | 166 | * atlx_irq_enable - Enable default interrupt generation settings |
167 | * @adapter: board private structure | 167 | * @adapter: board private structure |
168 | */ | 168 | */ |
@@ -172,7 +172,7 @@ static void atlx_irq_enable(struct atlx_adapter *adapter) | |||
172 | adapter->int_enabled = true; | 172 | adapter->int_enabled = true; |
173 | } | 173 | } |
174 | 174 | ||
175 | /* | 175 | /** |
176 | * atlx_irq_disable - Mask off interrupt generation on the NIC | 176 | * atlx_irq_disable - Mask off interrupt generation on the NIC |
177 | * @adapter: board private structure | 177 | * @adapter: board private structure |
178 | */ | 178 | */ |
@@ -193,7 +193,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter) | |||
193 | spin_unlock_irqrestore(&adapter->lock, flags); | 193 | spin_unlock_irqrestore(&adapter->lock, flags); |
194 | } | 194 | } |
195 | 195 | ||
196 | /* | 196 | /** |
197 | * atlx_tx_timeout - Respond to a Tx Hang | 197 | * atlx_tx_timeout - Respond to a Tx Hang |
198 | * @netdev: network interface device structure | 198 | * @netdev: network interface device structure |
199 | */ | 199 | */ |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 53659f321d51..dfa757e74296 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -90,7 +90,7 @@ void bnx2x_send_unload_done(struct bnx2x *bp); | |||
90 | * bnx2x_config_rss_pf - configure RSS parameters in a PF. | 90 | * bnx2x_config_rss_pf - configure RSS parameters in a PF. |
91 | * | 91 | * |
92 | * @bp: driver handle | 92 | * @bp: driver handle |
93 | * @rss_obj RSS object to use | 93 | * @rss_obj: RSS object to use |
94 | * @ind_table: indirection table to configure | 94 | * @ind_table: indirection table to configure |
95 | * @config_hash: re-configure RSS hash keys configuration | 95 | * @config_hash: re-configure RSS hash keys configuration |
96 | */ | 96 | */ |
diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c index 689e5e19cc0b..8532a8159025 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_cee.c +++ b/drivers/net/ethernet/brocade/bna/bfa_cee.c | |||
@@ -52,13 +52,7 @@ bfa_cee_format_lldp_cfg(struct bfa_cee_lldp_cfg *lldp_cfg) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * bfa_cee_attr_meminfo() | 55 | * bfa_cee_attr_meminfo - Returns the size of the DMA memory needed by CEE attributes |
56 | * | ||
57 | * @brief Returns the size of the DMA memory needed by CEE attributes | ||
58 | * | ||
59 | * @param[in] void | ||
60 | * | ||
61 | * @return Size of DMA region | ||
62 | */ | 56 | */ |
63 | static u32 | 57 | static u32 |
64 | bfa_cee_attr_meminfo(void) | 58 | bfa_cee_attr_meminfo(void) |
@@ -66,13 +60,7 @@ bfa_cee_attr_meminfo(void) | |||
66 | return roundup(sizeof(struct bfa_cee_attr), BFA_DMA_ALIGN_SZ); | 60 | return roundup(sizeof(struct bfa_cee_attr), BFA_DMA_ALIGN_SZ); |
67 | } | 61 | } |
68 | /** | 62 | /** |
69 | * bfa_cee_stats_meminfo() | 63 | * bfa_cee_stats_meminfo - Returns the size of the DMA memory needed by CEE stats |
70 | * | ||
71 | * @brief Returns the size of the DMA memory needed by CEE stats | ||
72 | * | ||
73 | * @param[in] void | ||
74 | * | ||
75 | * @return Size of DMA region | ||
76 | */ | 64 | */ |
77 | static u32 | 65 | static u32 |
78 | bfa_cee_stats_meminfo(void) | 66 | bfa_cee_stats_meminfo(void) |
@@ -81,14 +69,10 @@ bfa_cee_stats_meminfo(void) | |||
81 | } | 69 | } |
82 | 70 | ||
83 | /** | 71 | /** |
84 | * bfa_cee_get_attr_isr() | 72 | * bfa_cee_get_attr_isr - CEE ISR for get-attributes responses from f/w |
85 | * | 73 | * |
86 | * @brief CEE ISR for get-attributes responses from f/w | 74 | * @cee: Pointer to the CEE module |
87 | * | 75 | * @status: Return status from the f/w |
88 | * @param[in] cee - Pointer to the CEE module | ||
89 | * status - Return status from the f/w | ||
90 | * | ||
91 | * @return void | ||
92 | */ | 76 | */ |
93 | static void | 77 | static void |
94 | bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status) | 78 | bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status) |
@@ -105,14 +89,10 @@ bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status) | |||
105 | } | 89 | } |
106 | 90 | ||
107 | /** | 91 | /** |
108 | * bfa_cee_get_attr_isr() | 92 | * bfa_cee_get_attr_isr - CEE ISR for get-stats responses from f/w |
109 | * | 93 | * |
110 | * @brief CEE ISR for get-stats responses from f/w | 94 | * @cee: Pointer to the CEE module |
111 | * | 95 | * @status: Return status from the f/w |
112 | * @param[in] cee - Pointer to the CEE module | ||
113 | * status - Return status from the f/w | ||
114 | * | ||
115 | * @return void | ||
116 | */ | 96 | */ |
117 | static void | 97 | static void |
118 | bfa_cee_get_stats_isr(struct bfa_cee *cee, enum bfa_status status) | 98 | bfa_cee_get_stats_isr(struct bfa_cee *cee, enum bfa_status status) |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index cfb60e1f51da..dd901c5061b9 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c | |||
@@ -2877,7 +2877,7 @@ static void sge_timer_tx(unsigned long data) | |||
2877 | mod_timer(&qs->tx_reclaim_timer, jiffies + next_period); | 2877 | mod_timer(&qs->tx_reclaim_timer, jiffies + next_period); |
2878 | } | 2878 | } |
2879 | 2879 | ||
2880 | /* | 2880 | /** |
2881 | * sge_timer_rx - perform periodic maintenance of an SGE qset | 2881 | * sge_timer_rx - perform periodic maintenance of an SGE qset |
2882 | * @data: the SGE queue set to maintain | 2882 | * @data: the SGE queue set to maintain |
2883 | * | 2883 | * |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c index 44ac2f40b644..bff8a3cdd3df 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | |||
@@ -1076,7 +1076,7 @@ static int t3_flash_erase_sectors(struct adapter *adapter, int start, int end) | |||
1076 | return 0; | 1076 | return 0; |
1077 | } | 1077 | } |
1078 | 1078 | ||
1079 | /* | 1079 | /** |
1080 | * t3_load_fw - download firmware | 1080 | * t3_load_fw - download firmware |
1081 | * @adapter: the adapter | 1081 | * @adapter: the adapter |
1082 | * @fw_data: the firmware image to write | 1082 | * @fw_data: the firmware image to write |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c index 32e1dd566a14..fa947dfa4c30 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | |||
@@ -2010,7 +2010,7 @@ int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox, | |||
2010 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); | 2010 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
2011 | } | 2011 | } |
2012 | 2012 | ||
2013 | /* | 2013 | /** |
2014 | * t4_mem_win_read_len - read memory through PCIE memory window | 2014 | * t4_mem_win_read_len - read memory through PCIE memory window |
2015 | * @adap: the adapter | 2015 | * @adap: the adapter |
2016 | * @addr: address of first byte requested aligned on 32b. | 2016 | * @addr: address of first byte requested aligned on 32b. |
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c index a38167810546..20297881f8eb 100644 --- a/drivers/net/ethernet/ethoc.c +++ b/drivers/net/ethernet/ethoc.c | |||
@@ -902,7 +902,7 @@ static const struct net_device_ops ethoc_netdev_ops = { | |||
902 | }; | 902 | }; |
903 | 903 | ||
904 | /** | 904 | /** |
905 | * ethoc_probe() - initialize OpenCores ethernet MAC | 905 | * ethoc_probe - initialize OpenCores ethernet MAC |
906 | * pdev: platform device | 906 | * pdev: platform device |
907 | */ | 907 | */ |
908 | static int __devinit ethoc_probe(struct platform_device *pdev) | 908 | static int __devinit ethoc_probe(struct platform_device *pdev) |
@@ -1140,7 +1140,7 @@ out: | |||
1140 | } | 1140 | } |
1141 | 1141 | ||
1142 | /** | 1142 | /** |
1143 | * ethoc_remove() - shutdown OpenCores ethernet MAC | 1143 | * ethoc_remove - shutdown OpenCores ethernet MAC |
1144 | * @pdev: platform device | 1144 | * @pdev: platform device |
1145 | */ | 1145 | */ |
1146 | static int __devexit ethoc_remove(struct platform_device *pdev) | 1146 | static int __devexit ethoc_remove(struct platform_device *pdev) |
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index dafd797a6069..fffd20528b5d 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c | |||
@@ -1389,8 +1389,8 @@ fec_set_mac_address(struct net_device *ndev, void *p) | |||
1389 | } | 1389 | } |
1390 | 1390 | ||
1391 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1391 | #ifdef CONFIG_NET_POLL_CONTROLLER |
1392 | /* | 1392 | /** |
1393 | * fec_poll_controller: FEC Poll controller function | 1393 | * fec_poll_controller - FEC Poll controller function |
1394 | * @dev: The FEC network adapter | 1394 | * @dev: The FEC network adapter |
1395 | * | 1395 | * |
1396 | * Polled functionality used by netconsole and others in non interrupt mode | 1396 | * Polled functionality used by netconsole and others in non interrupt mode |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c index c526279e4927..3d6839528761 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_hw.c +++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c | |||
@@ -399,7 +399,7 @@ void e1000_set_media_type(struct e1000_hw *hw) | |||
399 | } | 399 | } |
400 | 400 | ||
401 | /** | 401 | /** |
402 | * e1000_reset_hw: reset the hardware completely | 402 | * e1000_reset_hw - reset the hardware completely |
403 | * @hw: Struct containing variables accessed by shared code | 403 | * @hw: Struct containing variables accessed by shared code |
404 | * | 404 | * |
405 | * Reset the transmit and receive units; mask and clear all interrupts. | 405 | * Reset the transmit and receive units; mask and clear all interrupts. |
@@ -546,7 +546,7 @@ s32 e1000_reset_hw(struct e1000_hw *hw) | |||
546 | } | 546 | } |
547 | 547 | ||
548 | /** | 548 | /** |
549 | * e1000_init_hw: Performs basic configuration of the adapter. | 549 | * e1000_init_hw - Performs basic configuration of the adapter. |
550 | * @hw: Struct containing variables accessed by shared code | 550 | * @hw: Struct containing variables accessed by shared code |
551 | * | 551 | * |
552 | * Assumes that the controller has previously been reset and is in a | 552 | * Assumes that the controller has previously been reset and is in a |
@@ -2591,7 +2591,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw) | |||
2591 | * @hw: Struct containing variables accessed by shared code | 2591 | * @hw: Struct containing variables accessed by shared code |
2592 | * @speed: Speed of the connection | 2592 | * @speed: Speed of the connection |
2593 | * @duplex: Duplex setting of the connection | 2593 | * @duplex: Duplex setting of the connection |
2594 | 2594 | * | |
2595 | * Detects the current speed and duplex settings of the hardware. | 2595 | * Detects the current speed and duplex settings of the hardware. |
2596 | */ | 2596 | */ |
2597 | s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex) | 2597 | s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex) |
@@ -2959,7 +2959,7 @@ static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr, | |||
2959 | * @hw: Struct containing variables accessed by shared code | 2959 | * @hw: Struct containing variables accessed by shared code |
2960 | * @reg_addr: address of the PHY register to write | 2960 | * @reg_addr: address of the PHY register to write |
2961 | * @data: data to write to the PHY | 2961 | * @data: data to write to the PHY |
2962 | 2962 | * | |
2963 | * Writes a value to a PHY register | 2963 | * Writes a value to a PHY register |
2964 | */ | 2964 | */ |
2965 | s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data) | 2965 | s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data) |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index a166efc2fead..ca477e87eb87 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -2159,7 +2159,7 @@ void e1000e_release_hw_control(struct e1000_adapter *adapter) | |||
2159 | } | 2159 | } |
2160 | 2160 | ||
2161 | /** | 2161 | /** |
2162 | * @e1000_alloc_ring - allocate memory for a ring structure | 2162 | * e1000_alloc_ring_dma - allocate memory for a ring structure |
2163 | **/ | 2163 | **/ |
2164 | static int e1000_alloc_ring_dma(struct e1000_adapter *adapter, | 2164 | static int e1000_alloc_ring_dma(struct e1000_adapter *adapter, |
2165 | struct e1000_ring *ring) | 2165 | struct e1000_ring *ring) |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 01ced68d3aac..60e307548f4e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -5777,6 +5777,7 @@ static void igb_tx_hwtstamp(struct igb_q_vector *q_vector, | |||
5777 | /** | 5777 | /** |
5778 | * igb_clean_tx_irq - Reclaim resources after transmit completes | 5778 | * igb_clean_tx_irq - Reclaim resources after transmit completes |
5779 | * @q_vector: pointer to q_vector containing needed info | 5779 | * @q_vector: pointer to q_vector containing needed info |
5780 | * | ||
5780 | * returns true if ring is completely cleaned | 5781 | * returns true if ring is completely cleaned |
5781 | **/ | 5782 | **/ |
5782 | static bool igb_clean_tx_irq(struct igb_q_vector *q_vector) | 5783 | static bool igb_clean_tx_irq(struct igb_q_vector *q_vector) |
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 8ec74b07f940..0696abfe9944 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c | |||
@@ -766,6 +766,7 @@ static void igbvf_set_itr(struct igbvf_adapter *adapter) | |||
766 | /** | 766 | /** |
767 | * igbvf_clean_tx_irq - Reclaim resources after transmit completes | 767 | * igbvf_clean_tx_irq - Reclaim resources after transmit completes |
768 | * @adapter: board private structure | 768 | * @adapter: board private structure |
769 | * | ||
769 | * returns true if ring is completely cleaned | 770 | * returns true if ring is completely cleaned |
770 | **/ | 771 | **/ |
771 | static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring) | 772 | static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring) |
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c index 30a6cc426037..eea0e10ce12f 100644 --- a/drivers/net/ethernet/intel/igbvf/vf.c +++ b/drivers/net/ethernet/intel/igbvf/vf.c | |||
@@ -283,7 +283,8 @@ static s32 e1000_set_vfta_vf(struct e1000_hw *hw, u16 vid, bool set) | |||
283 | return err; | 283 | return err; |
284 | } | 284 | } |
285 | 285 | ||
286 | /** e1000_rlpml_set_vf - Set the maximum receive packet length | 286 | /** |
287 | * e1000_rlpml_set_vf - Set the maximum receive packet length | ||
287 | * @hw: pointer to the HW structure | 288 | * @hw: pointer to the HW structure |
288 | * @max_size: value to assign to max frame size | 289 | * @max_size: value to assign to max frame size |
289 | **/ | 290 | **/ |
@@ -302,7 +303,7 @@ void e1000_rlpml_set_vf(struct e1000_hw *hw, u16 max_size) | |||
302 | * e1000_rar_set_vf - set device MAC address | 303 | * e1000_rar_set_vf - set device MAC address |
303 | * @hw: pointer to the HW structure | 304 | * @hw: pointer to the HW structure |
304 | * @addr: pointer to the receive address | 305 | * @addr: pointer to the receive address |
305 | * @index receive address array register | 306 | * @index: receive address array register |
306 | **/ | 307 | **/ |
307 | static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index) | 308 | static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index) |
308 | { | 309 | { |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 5fce363d810a..aab649f8c5f0 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -2276,9 +2276,9 @@ static void ixgb_netpoll(struct net_device *dev) | |||
2276 | #endif | 2276 | #endif |
2277 | 2277 | ||
2278 | /** | 2278 | /** |
2279 | * ixgb_io_error_detected() - called when PCI error is detected | 2279 | * ixgb_io_error_detected - called when PCI error is detected |
2280 | * @pdev pointer to pci device with error | 2280 | * @pdev: pointer to pci device with error |
2281 | * @state pci channel state after error | 2281 | * @state: pci channel state after error |
2282 | * | 2282 | * |
2283 | * This callback is called by the PCI subsystem whenever | 2283 | * This callback is called by the PCI subsystem whenever |
2284 | * a PCI bus error is detected. | 2284 | * a PCI bus error is detected. |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 77ac41feb0fe..bb7fde45c057 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
@@ -3132,7 +3132,7 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, | |||
3132 | } | 3132 | } |
3133 | 3133 | ||
3134 | /** | 3134 | /** |
3135 | * ixgbe_get_wwn_prefix_generic Get alternative WWNN/WWPN prefix from | 3135 | * ixgbe_get_wwn_prefix_generic - Get alternative WWNN/WWPN prefix from |
3136 | * the EEPROM | 3136 | * the EEPROM |
3137 | * @hw: pointer to hardware structure | 3137 | * @hw: pointer to hardware structure |
3138 | * @wwnn_prefix: the alternative WWNN prefix | 3138 | * @wwnn_prefix: the alternative WWNN prefix |
@@ -3325,6 +3325,7 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, | |||
3325 | * ixgbe_calculate_checksum - Calculate checksum for buffer | 3325 | * ixgbe_calculate_checksum - Calculate checksum for buffer |
3326 | * @buffer: pointer to EEPROM | 3326 | * @buffer: pointer to EEPROM |
3327 | * @length: size of EEPROM to calculate a checksum for | 3327 | * @length: size of EEPROM to calculate a checksum for |
3328 | * | ||
3328 | * Calculates the checksum for some buffer on a specified length. The | 3329 | * Calculates the checksum for some buffer on a specified length. The |
3329 | * checksum calculated is returned. | 3330 | * checksum calculated is returned. |
3330 | **/ | 3331 | **/ |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c index bc07933d67da..0ee4dbf4a752 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | /** | 39 | /** |
40 | * ixgbe_fcoe_clear_ddp - clear the given ddp context | 40 | * ixgbe_fcoe_clear_ddp - clear the given ddp context |
41 | * @ddp - ptr to the ixgbe_fcoe_ddp | 41 | * @ddp: ptr to the ixgbe_fcoe_ddp |
42 | * | 42 | * |
43 | * Returns : none | 43 | * Returns : none |
44 | * | 44 | * |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index c377706e81a8..f36c3c38dbcb 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | |||
@@ -252,7 +252,7 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) | |||
252 | } | 252 | } |
253 | 253 | ||
254 | /** | 254 | /** |
255 | * ixgbe_set_sriov_queues: Allocate queues for IOV use | 255 | * ixgbe_set_sriov_queues - Allocate queues for IOV use |
256 | * @adapter: board private structure to initialize | 256 | * @adapter: board private structure to initialize |
257 | * | 257 | * |
258 | * IOV doesn't actually use anything, so just NAK the | 258 | * IOV doesn't actually use anything, so just NAK the |
@@ -265,7 +265,7 @@ static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter) | |||
265 | } | 265 | } |
266 | 266 | ||
267 | /** | 267 | /** |
268 | * ixgbe_set_rss_queues: Allocate queues for RSS | 268 | * ixgbe_set_rss_queues - Allocate queues for RSS |
269 | * @adapter: board private structure to initialize | 269 | * @adapter: board private structure to initialize |
270 | * | 270 | * |
271 | * This is our "base" multiqueue mode. RSS (Receive Side Scaling) will try | 271 | * This is our "base" multiqueue mode. RSS (Receive Side Scaling) will try |
@@ -288,7 +288,7 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter) | |||
288 | } | 288 | } |
289 | 289 | ||
290 | /** | 290 | /** |
291 | * ixgbe_set_fdir_queues: Allocate queues for Flow Director | 291 | * ixgbe_set_fdir_queues - Allocate queues for Flow Director |
292 | * @adapter: board private structure to initialize | 292 | * @adapter: board private structure to initialize |
293 | * | 293 | * |
294 | * Flow Director is an advanced Rx filter, attempting to get Rx flows back | 294 | * Flow Director is an advanced Rx filter, attempting to get Rx flows back |
@@ -323,7 +323,7 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter) | |||
323 | 323 | ||
324 | #ifdef IXGBE_FCOE | 324 | #ifdef IXGBE_FCOE |
325 | /** | 325 | /** |
326 | * ixgbe_set_fcoe_queues: Allocate queues for Fiber Channel over Ethernet (FCoE) | 326 | * ixgbe_set_fcoe_queues - Allocate queues for Fiber Channel over Ethernet (FCoE) |
327 | * @adapter: board private structure to initialize | 327 | * @adapter: board private structure to initialize |
328 | * | 328 | * |
329 | * FCoE RX FCRETA can use up to 8 rx queues for up to 8 different exchanges. | 329 | * FCoE RX FCRETA can use up to 8 rx queues for up to 8 different exchanges. |
@@ -410,7 +410,7 @@ static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter) | |||
410 | #endif | 410 | #endif |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * ixgbe_set_num_queues: Allocate queues for device, feature dependent | 413 | * ixgbe_set_num_queues - Allocate queues for device, feature dependent |
414 | * @adapter: board private structure to initialize | 414 | * @adapter: board private structure to initialize |
415 | * | 415 | * |
416 | * This is the top level queue allocation routine. The order here is very | 416 | * This is the top level queue allocation routine. The order here is very |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5afbb37a738c..9313f5c84fad 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -516,7 +516,7 @@ static void ixgbe_get_hw_control(struct ixgbe_adapter *adapter) | |||
516 | ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD); | 516 | ctrl_ext | IXGBE_CTRL_EXT_DRV_LOAD); |
517 | } | 517 | } |
518 | 518 | ||
519 | /* | 519 | /** |
520 | * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors | 520 | * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors |
521 | * @adapter: pointer to adapter struct | 521 | * @adapter: pointer to adapter struct |
522 | * @direction: 0 for Rx, 1 for Tx, -1 for other causes | 522 | * @direction: 0 for Rx, 1 for Tx, -1 for other causes |
@@ -3591,7 +3591,7 @@ static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter) | |||
3591 | } | 3591 | } |
3592 | 3592 | ||
3593 | #ifdef CONFIG_IXGBE_DCB | 3593 | #ifdef CONFIG_IXGBE_DCB |
3594 | /* | 3594 | /** |
3595 | * ixgbe_configure_dcb - Configure DCB hardware | 3595 | * ixgbe_configure_dcb - Configure DCB hardware |
3596 | * @adapter: ixgbe adapter struct | 3596 | * @adapter: ixgbe adapter struct |
3597 | * | 3597 | * |
@@ -3658,11 +3658,11 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) | |||
3658 | /* Additional bittime to account for IXGBE framing */ | 3658 | /* Additional bittime to account for IXGBE framing */ |
3659 | #define IXGBE_ETH_FRAMING 20 | 3659 | #define IXGBE_ETH_FRAMING 20 |
3660 | 3660 | ||
3661 | /* | 3661 | /** |
3662 | * ixgbe_hpbthresh - calculate high water mark for flow control | 3662 | * ixgbe_hpbthresh - calculate high water mark for flow control |
3663 | * | 3663 | * |
3664 | * @adapter: board private structure to calculate for | 3664 | * @adapter: board private structure to calculate for |
3665 | * @pb - packet buffer to calculate | 3665 | * @pb: packet buffer to calculate |
3666 | */ | 3666 | */ |
3667 | static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb) | 3667 | static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb) |
3668 | { | 3668 | { |
@@ -3722,11 +3722,11 @@ static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb) | |||
3722 | return marker; | 3722 | return marker; |
3723 | } | 3723 | } |
3724 | 3724 | ||
3725 | /* | 3725 | /** |
3726 | * ixgbe_lpbthresh - calculate low water mark for for flow control | 3726 | * ixgbe_lpbthresh - calculate low water mark for for flow control |
3727 | * | 3727 | * |
3728 | * @adapter: board private structure to calculate for | 3728 | * @adapter: board private structure to calculate for |
3729 | * @pb - packet buffer to calculate | 3729 | * @pb: packet buffer to calculate |
3730 | */ | 3730 | */ |
3731 | static int ixgbe_lpbthresh(struct ixgbe_adapter *adapter) | 3731 | static int ixgbe_lpbthresh(struct ixgbe_adapter *adapter) |
3732 | { | 3732 | { |
@@ -5243,7 +5243,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) | |||
5243 | 5243 | ||
5244 | /** | 5244 | /** |
5245 | * ixgbe_fdir_reinit_subtask - worker thread to reinit FDIR filter table | 5245 | * ixgbe_fdir_reinit_subtask - worker thread to reinit FDIR filter table |
5246 | * @adapter - pointer to the device adapter structure | 5246 | * @adapter: pointer to the device adapter structure |
5247 | **/ | 5247 | **/ |
5248 | static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter) | 5248 | static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter) |
5249 | { | 5249 | { |
@@ -5279,7 +5279,7 @@ static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter) | |||
5279 | 5279 | ||
5280 | /** | 5280 | /** |
5281 | * ixgbe_check_hang_subtask - check for hung queues and dropped interrupts | 5281 | * ixgbe_check_hang_subtask - check for hung queues and dropped interrupts |
5282 | * @adapter - pointer to the device adapter structure | 5282 | * @adapter: pointer to the device adapter structure |
5283 | * | 5283 | * |
5284 | * This function serves two purposes. First it strobes the interrupt lines | 5284 | * This function serves two purposes. First it strobes the interrupt lines |
5285 | * in order to make certain interrupts are occurring. Secondly it sets the | 5285 | * in order to make certain interrupts are occurring. Secondly it sets the |
@@ -5327,8 +5327,8 @@ static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter) | |||
5327 | 5327 | ||
5328 | /** | 5328 | /** |
5329 | * ixgbe_watchdog_update_link - update the link status | 5329 | * ixgbe_watchdog_update_link - update the link status |
5330 | * @adapter - pointer to the device adapter structure | 5330 | * @adapter: pointer to the device adapter structure |
5331 | * @link_speed - pointer to a u32 to store the link_speed | 5331 | * @link_speed: pointer to a u32 to store the link_speed |
5332 | **/ | 5332 | **/ |
5333 | static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter) | 5333 | static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter) |
5334 | { | 5334 | { |
@@ -5371,7 +5371,7 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter) | |||
5371 | /** | 5371 | /** |
5372 | * ixgbe_watchdog_link_is_up - update netif_carrier status and | 5372 | * ixgbe_watchdog_link_is_up - update netif_carrier status and |
5373 | * print link up message | 5373 | * print link up message |
5374 | * @adapter - pointer to the device adapter structure | 5374 | * @adapter: pointer to the device adapter structure |
5375 | **/ | 5375 | **/ |
5376 | static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter) | 5376 | static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter) |
5377 | { | 5377 | { |
@@ -5431,7 +5431,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter) | |||
5431 | /** | 5431 | /** |
5432 | * ixgbe_watchdog_link_is_down - update netif_carrier status and | 5432 | * ixgbe_watchdog_link_is_down - update netif_carrier status and |
5433 | * print link down message | 5433 | * print link down message |
5434 | * @adapter - pointer to the adapter structure | 5434 | * @adapter: pointer to the adapter structure |
5435 | **/ | 5435 | **/ |
5436 | static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter) | 5436 | static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter) |
5437 | { | 5437 | { |
@@ -5459,7 +5459,7 @@ static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter) | |||
5459 | 5459 | ||
5460 | /** | 5460 | /** |
5461 | * ixgbe_watchdog_flush_tx - flush queues on link down | 5461 | * ixgbe_watchdog_flush_tx - flush queues on link down |
5462 | * @adapter - pointer to the device adapter structure | 5462 | * @adapter: pointer to the device adapter structure |
5463 | **/ | 5463 | **/ |
5464 | static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter) | 5464 | static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter) |
5465 | { | 5465 | { |
@@ -5508,7 +5508,7 @@ static void ixgbe_spoof_check(struct ixgbe_adapter *adapter) | |||
5508 | 5508 | ||
5509 | /** | 5509 | /** |
5510 | * ixgbe_watchdog_subtask - check and bring link up | 5510 | * ixgbe_watchdog_subtask - check and bring link up |
5511 | * @adapter - pointer to the device adapter structure | 5511 | * @adapter: pointer to the device adapter structure |
5512 | **/ | 5512 | **/ |
5513 | static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter) | 5513 | static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter) |
5514 | { | 5514 | { |
@@ -5532,7 +5532,7 @@ static void ixgbe_watchdog_subtask(struct ixgbe_adapter *adapter) | |||
5532 | 5532 | ||
5533 | /** | 5533 | /** |
5534 | * ixgbe_sfp_detection_subtask - poll for SFP+ cable | 5534 | * ixgbe_sfp_detection_subtask - poll for SFP+ cable |
5535 | * @adapter - the ixgbe adapter structure | 5535 | * @adapter: the ixgbe adapter structure |
5536 | **/ | 5536 | **/ |
5537 | static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter) | 5537 | static void ixgbe_sfp_detection_subtask(struct ixgbe_adapter *adapter) |
5538 | { | 5538 | { |
@@ -5599,7 +5599,7 @@ sfp_out: | |||
5599 | 5599 | ||
5600 | /** | 5600 | /** |
5601 | * ixgbe_sfp_link_config_subtask - set up link SFP after module install | 5601 | * ixgbe_sfp_link_config_subtask - set up link SFP after module install |
5602 | * @adapter - the ixgbe adapter structure | 5602 | * @adapter: the ixgbe adapter structure |
5603 | **/ | 5603 | **/ |
5604 | static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter) | 5604 | static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter) |
5605 | { | 5605 | { |
@@ -6586,8 +6586,9 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev, | |||
6586 | } | 6586 | } |
6587 | 6587 | ||
6588 | #ifdef CONFIG_IXGBE_DCB | 6588 | #ifdef CONFIG_IXGBE_DCB |
6589 | /* ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid. | 6589 | /** |
6590 | * #adapter: pointer to ixgbe_adapter | 6590 | * ixgbe_validate_rtr - verify 802.1Qp to Rx packet buffer mapping is valid. |
6591 | * @adapter: pointer to ixgbe_adapter | ||
6591 | * @tc: number of traffic classes currently enabled | 6592 | * @tc: number of traffic classes currently enabled |
6592 | * | 6593 | * |
6593 | * Configure a valid 802.1Qp to Rx packet buffer mapping ie confirm | 6594 | * Configure a valid 802.1Qp to Rx packet buffer mapping ie confirm |
@@ -6622,8 +6623,8 @@ static void ixgbe_validate_rtr(struct ixgbe_adapter *adapter, u8 tc) | |||
6622 | return; | 6623 | return; |
6623 | } | 6624 | } |
6624 | 6625 | ||
6625 | /* ixgbe_setup_tc - routine to configure net_device for multiple traffic | 6626 | /** |
6626 | * classes. | 6627 | * ixgbe_setup_tc - configure net_device for multiple traffic classes |
6627 | * | 6628 | * |
6628 | * @netdev: net device to configure | 6629 | * @netdev: net device to configure |
6629 | * @tc: number of traffic classes to enable | 6630 | * @tc: number of traffic classes to enable |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index daddd844691f..3456d5617143 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | |||
@@ -107,7 +107,7 @@ static struct sock_filter ptp_filter[] = { | |||
107 | 107 | ||
108 | /** | 108 | /** |
109 | * ixgbe_ptp_read - read raw cycle counter (to be used by time counter) | 109 | * ixgbe_ptp_read - read raw cycle counter (to be used by time counter) |
110 | * @cc - the cyclecounter structure | 110 | * @cc: the cyclecounter structure |
111 | * | 111 | * |
112 | * this function reads the cyclecounter registers and is called by the | 112 | * this function reads the cyclecounter registers and is called by the |
113 | * cyclecounter structure used to construct a ns counter from the | 113 | * cyclecounter structure used to construct a ns counter from the |
@@ -128,8 +128,8 @@ static cycle_t ixgbe_ptp_read(const struct cyclecounter *cc) | |||
128 | 128 | ||
129 | /** | 129 | /** |
130 | * ixgbe_ptp_adjfreq | 130 | * ixgbe_ptp_adjfreq |
131 | * @ptp - the ptp clock structure | 131 | * @ptp: the ptp clock structure |
132 | * @ppb - parts per billion adjustment from base | 132 | * @ppb: parts per billion adjustment from base |
133 | * | 133 | * |
134 | * adjust the frequency of the ptp cycle counter by the | 134 | * adjust the frequency of the ptp cycle counter by the |
135 | * indicated ppb from the base frequency. | 135 | * indicated ppb from the base frequency. |
@@ -175,8 +175,8 @@ static int ixgbe_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb) | |||
175 | 175 | ||
176 | /** | 176 | /** |
177 | * ixgbe_ptp_adjtime | 177 | * ixgbe_ptp_adjtime |
178 | * @ptp - the ptp clock structure | 178 | * @ptp: the ptp clock structure |
179 | * @delta - offset to adjust the cycle counter by | 179 | * @delta: offset to adjust the cycle counter by |
180 | * | 180 | * |
181 | * adjust the timer by resetting the timecounter structure. | 181 | * adjust the timer by resetting the timecounter structure. |
182 | */ | 182 | */ |
@@ -203,8 +203,8 @@ static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) | |||
203 | 203 | ||
204 | /** | 204 | /** |
205 | * ixgbe_ptp_gettime | 205 | * ixgbe_ptp_gettime |
206 | * @ptp - the ptp clock structure | 206 | * @ptp: the ptp clock structure |
207 | * @ts - timespec structure to hold the current time value | 207 | * @ts: timespec structure to hold the current time value |
208 | * | 208 | * |
209 | * read the timecounter and return the correct value on ns, | 209 | * read the timecounter and return the correct value on ns, |
210 | * after converting it into a struct timespec. | 210 | * after converting it into a struct timespec. |
@@ -229,8 +229,8 @@ static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) | |||
229 | 229 | ||
230 | /** | 230 | /** |
231 | * ixgbe_ptp_settime | 231 | * ixgbe_ptp_settime |
232 | * @ptp - the ptp clock structure | 232 | * @ptp: the ptp clock structure |
233 | * @ts - the timespec containing the new time for the cycle counter | 233 | * @ts: the timespec containing the new time for the cycle counter |
234 | * | 234 | * |
235 | * reset the timecounter to use a new base value instead of the kernel | 235 | * reset the timecounter to use a new base value instead of the kernel |
236 | * wall timer value. | 236 | * wall timer value. |
@@ -256,9 +256,9 @@ static int ixgbe_ptp_settime(struct ptp_clock_info *ptp, | |||
256 | 256 | ||
257 | /** | 257 | /** |
258 | * ixgbe_ptp_enable | 258 | * ixgbe_ptp_enable |
259 | * @ptp - the ptp clock structure | 259 | * @ptp: the ptp clock structure |
260 | * @rq - the requested feature to change | 260 | * @rq: the requested feature to change |
261 | * @on - whether to enable or disable the feature | 261 | * @on: whether to enable or disable the feature |
262 | * | 262 | * |
263 | * enable (or disable) ancillary features of the phc subsystem. | 263 | * enable (or disable) ancillary features of the phc subsystem. |
264 | * our driver only supports the PPS feature on the X540 | 264 | * our driver only supports the PPS feature on the X540 |
@@ -294,8 +294,8 @@ static int ixgbe_ptp_enable(struct ptp_clock_info *ptp, | |||
294 | 294 | ||
295 | /** | 295 | /** |
296 | * ixgbe_ptp_check_pps_event | 296 | * ixgbe_ptp_check_pps_event |
297 | * @adapter - the private adapter structure | 297 | * @adapter: the private adapter structure |
298 | * @eicr - the interrupt cause register value | 298 | * @eicr: the interrupt cause register value |
299 | * | 299 | * |
300 | * This function is called by the interrupt routine when checking for | 300 | * This function is called by the interrupt routine when checking for |
301 | * interrupts. It will check and handle a pps event. | 301 | * interrupts. It will check and handle a pps event. |
@@ -325,8 +325,8 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr) | |||
325 | 325 | ||
326 | /** | 326 | /** |
327 | * ixgbe_ptp_enable_sdp | 327 | * ixgbe_ptp_enable_sdp |
328 | * @hw - the hardware private structure | 328 | * @hw: the hardware private structure |
329 | * @shift - the clock shift for calculating nanoseconds | 329 | * @shift: the clock shift for calculating nanoseconds |
330 | * | 330 | * |
331 | * this function enables the clock out feature on the sdp0 for the | 331 | * this function enables the clock out feature on the sdp0 for the |
332 | * X540 device. It will create a 1second periodic output that can be | 332 | * X540 device. It will create a 1second periodic output that can be |
@@ -399,7 +399,7 @@ static void ixgbe_ptp_enable_sdp(struct ixgbe_hw *hw, int shift) | |||
399 | 399 | ||
400 | /** | 400 | /** |
401 | * ixgbe_ptp_disable_sdp | 401 | * ixgbe_ptp_disable_sdp |
402 | * @hw - the private hardware structure | 402 | * @hw: the private hardware structure |
403 | * | 403 | * |
404 | * this function disables the auxiliary SDP clock out feature | 404 | * this function disables the auxiliary SDP clock out feature |
405 | */ | 405 | */ |
@@ -769,7 +769,7 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter, | |||
769 | 769 | ||
770 | /** | 770 | /** |
771 | * ixgbe_ptp_start_cyclecounter - create the cycle counter from hw | 771 | * ixgbe_ptp_start_cyclecounter - create the cycle counter from hw |
772 | * @adapter - pointer to the adapter structure | 772 | * @adapter: pointer to the adapter structure |
773 | * | 773 | * |
774 | * this function initializes the timecounter and cyclecounter | 774 | * this function initializes the timecounter and cyclecounter |
775 | * structures for use in generated a ns counter from the arbitrary | 775 | * structures for use in generated a ns counter from the arbitrary |
@@ -905,7 +905,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) | |||
905 | 905 | ||
906 | /** | 906 | /** |
907 | * ixgbe_ptp_init | 907 | * ixgbe_ptp_init |
908 | * @adapter - the ixgbe private adapter structure | 908 | * @adapter: the ixgbe private adapter structure |
909 | * | 909 | * |
910 | * This function performs the required steps for enabling ptp | 910 | * This function performs the required steps for enabling ptp |
911 | * support. If ptp support has already been loaded it simply calls the | 911 | * support. If ptp support has already been loaded it simply calls the |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c index 2334fce47018..16ddf14e8ba4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | |||
@@ -95,11 +95,11 @@ static ssize_t ixgbe_hwmon_show_maxopthresh(struct device *dev, | |||
95 | return sprintf(buf, "%u\n", value); | 95 | return sprintf(buf, "%u\n", value); |
96 | } | 96 | } |
97 | 97 | ||
98 | /* | 98 | /** |
99 | * ixgbe_add_hwmon_attr - Create hwmon attr table for a hwmon sysfs file. | 99 | * ixgbe_add_hwmon_attr - Create hwmon attr table for a hwmon sysfs file. |
100 | * @ adapter: pointer to the adapter structure | 100 | * @adapter: pointer to the adapter structure |
101 | * @ offset: offset in the eeprom sensor data table | 101 | * @offset: offset in the eeprom sensor data table |
102 | * @ type: type of sensor data to display | 102 | * @type: type of sensor data to display |
103 | * | 103 | * |
104 | * For each file we want in hwmon's sysfs interface we need a device_attribute | 104 | * For each file we want in hwmon's sysfs interface we need a device_attribute |
105 | * This is included in our hwmon_attr struct that contains the references to | 105 | * This is included in our hwmon_attr struct that contains the references to |
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index f69ec4288b10..0368160286f9 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -115,7 +115,7 @@ static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw, | |||
115 | IXGBE_WRITE_REG(hw, IXGBE_VFRDT(rx_ring->reg_idx), val); | 115 | IXGBE_WRITE_REG(hw, IXGBE_VFRDT(rx_ring->reg_idx), val); |
116 | } | 116 | } |
117 | 117 | ||
118 | /* | 118 | /** |
119 | * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors | 119 | * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors |
120 | * @adapter: pointer to adapter struct | 120 | * @adapter: pointer to adapter struct |
121 | * @direction: 0 for Rx, 1 for Tx, -1 for other causes | 121 | * @direction: 0 for Rx, 1 for Tx, -1 for other causes |
@@ -1942,8 +1942,8 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter, | |||
1942 | } | 1942 | } |
1943 | } | 1943 | } |
1944 | 1944 | ||
1945 | /* | 1945 | /** |
1946 | * ixgbevf_set_num_queues: Allocate queues for device, feature dependent | 1946 | * ixgbevf_set_num_queues - Allocate queues for device, feature dependent |
1947 | * @adapter: board private structure to initialize | 1947 | * @adapter: board private structure to initialize |
1948 | * | 1948 | * |
1949 | * This is the top level queue allocation routine. The order here is very | 1949 | * This is the top level queue allocation routine. The order here is very |
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index 875dd5e264eb..76bf1598c609 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c | |||
@@ -1103,7 +1103,7 @@ static void ks_set_grpaddr(struct ks_net *ks) | |||
1103 | } | 1103 | } |
1104 | } /* ks_set_grpaddr */ | 1104 | } /* ks_set_grpaddr */ |
1105 | 1105 | ||
1106 | /* | 1106 | /** |
1107 | * ks_clear_mcast - clear multicast information | 1107 | * ks_clear_mcast - clear multicast information |
1108 | * | 1108 | * |
1109 | * @ks : The chip information | 1109 | * @ks : The chip information |
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index eaf9ff0262a9..24a4c5716cf5 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -3913,7 +3913,7 @@ static void hw_start_rx(struct ksz_hw *hw) | |||
3913 | hw->rx_stop = 2; | 3913 | hw->rx_stop = 2; |
3914 | } | 3914 | } |
3915 | 3915 | ||
3916 | /* | 3916 | /** |
3917 | * hw_stop_rx - stop receiving | 3917 | * hw_stop_rx - stop receiving |
3918 | * @hw: The hardware instance. | 3918 | * @hw: The hardware instance. |
3919 | * | 3919 | * |
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index e7cd587d8ae7..d958c2299372 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -3377,7 +3377,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit, | |||
3377 | } while (cnt < 20); | 3377 | } while (cnt < 20); |
3378 | return ret; | 3378 | return ret; |
3379 | } | 3379 | } |
3380 | /* | 3380 | /** |
3381 | * check_pci_device_id - Checks if the device id is supported | 3381 | * check_pci_device_id - Checks if the device id is supported |
3382 | * @id : device id | 3382 | * @id : device id |
3383 | * Description: Function to check if the pci device id is supported by driver. | 3383 | * Description: Function to check if the pci device id is supported by driver. |
@@ -5238,7 +5238,7 @@ static u64 do_s2io_read_unicast_mc(struct s2io_nic *sp, int offset) | |||
5238 | } | 5238 | } |
5239 | 5239 | ||
5240 | /** | 5240 | /** |
5241 | * s2io_set_mac_addr driver entry point | 5241 | * s2io_set_mac_addr - driver entry point |
5242 | */ | 5242 | */ |
5243 | 5243 | ||
5244 | static int s2io_set_mac_addr(struct net_device *dev, void *p) | 5244 | static int s2io_set_mac_addr(struct net_device *dev, void *p) |
@@ -6088,7 +6088,7 @@ static int s2io_bist_test(struct s2io_nic *sp, uint64_t *data) | |||
6088 | } | 6088 | } |
6089 | 6089 | ||
6090 | /** | 6090 | /** |
6091 | * s2io-link_test - verifies the link state of the nic | 6091 | * s2io_link_test - verifies the link state of the nic |
6092 | * @sp ; private member of the device structure, which is a pointer to the | 6092 | * @sp ; private member of the device structure, which is a pointer to the |
6093 | * s2io_nic structure. | 6093 | * s2io_nic structure. |
6094 | * @data: variable that returns the result of each of the test conducted by | 6094 | * @data: variable that returns the result of each of the test conducted by |
@@ -6116,9 +6116,9 @@ static int s2io_link_test(struct s2io_nic *sp, uint64_t *data) | |||
6116 | 6116 | ||
6117 | /** | 6117 | /** |
6118 | * s2io_rldram_test - offline test for access to the RldRam chip on the NIC | 6118 | * s2io_rldram_test - offline test for access to the RldRam chip on the NIC |
6119 | * @sp - private member of the device structure, which is a pointer to the | 6119 | * @sp: private member of the device structure, which is a pointer to the |
6120 | * s2io_nic structure. | 6120 | * s2io_nic structure. |
6121 | * @data - variable that returns the result of each of the test | 6121 | * @data: variable that returns the result of each of the test |
6122 | * conducted by the driver. | 6122 | * conducted by the driver. |
6123 | * Description: | 6123 | * Description: |
6124 | * This is one of the offline test that tests the read and write | 6124 | * This is one of the offline test that tests the read and write |
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 928913c4f3ff..c503fbebdf7e 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -3218,7 +3218,7 @@ static void nv_force_linkspeed(struct net_device *dev, int speed, int duplex) | |||
3218 | } | 3218 | } |
3219 | 3219 | ||
3220 | /** | 3220 | /** |
3221 | * nv_update_linkspeed: Setup the MAC according to the link partner | 3221 | * nv_update_linkspeed - Setup the MAC according to the link partner |
3222 | * @dev: Network device to be configured | 3222 | * @dev: Network device to be configured |
3223 | * | 3223 | * |
3224 | * The function queries the PHY and checks if there is a link partner. | 3224 | * The function queries the PHY and checks if there is a link partner. |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c index e48f084ad226..5ae03e815ee9 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | |||
@@ -60,7 +60,7 @@ static void pch_gbe_plat_get_bus_info(struct pch_gbe_hw *hw) | |||
60 | /** | 60 | /** |
61 | * pch_gbe_plat_init_hw - Initialize hardware | 61 | * pch_gbe_plat_init_hw - Initialize hardware |
62 | * @hw: Pointer to the HW structure | 62 | * @hw: Pointer to the HW structure |
63 | * Returns | 63 | * Returns: |
64 | * 0: Successfully | 64 | * 0: Successfully |
65 | * Negative value: Failed-EBUSY | 65 | * Negative value: Failed-EBUSY |
66 | */ | 66 | */ |
@@ -108,7 +108,7 @@ static void pch_gbe_plat_init_function_pointers(struct pch_gbe_hw *hw) | |||
108 | /** | 108 | /** |
109 | * pch_gbe_hal_setup_init_funcs - Initializes function pointers | 109 | * pch_gbe_hal_setup_init_funcs - Initializes function pointers |
110 | * @hw: Pointer to the HW structure | 110 | * @hw: Pointer to the HW structure |
111 | * Returns | 111 | * Returns: |
112 | * 0: Successfully | 112 | * 0: Successfully |
113 | * ENOSYS: Function is not registered | 113 | * ENOSYS: Function is not registered |
114 | */ | 114 | */ |
@@ -137,7 +137,7 @@ inline void pch_gbe_hal_get_bus_info(struct pch_gbe_hw *hw) | |||
137 | /** | 137 | /** |
138 | * pch_gbe_hal_init_hw - Initialize hardware | 138 | * pch_gbe_hal_init_hw - Initialize hardware |
139 | * @hw: Pointer to the HW structure | 139 | * @hw: Pointer to the HW structure |
140 | * Returns | 140 | * Returns: |
141 | * 0: Successfully | 141 | * 0: Successfully |
142 | * ENOSYS: Function is not registered | 142 | * ENOSYS: Function is not registered |
143 | */ | 143 | */ |
@@ -155,7 +155,7 @@ inline s32 pch_gbe_hal_init_hw(struct pch_gbe_hw *hw) | |||
155 | * @hw: Pointer to the HW structure | 155 | * @hw: Pointer to the HW structure |
156 | * @offset: The register to read | 156 | * @offset: The register to read |
157 | * @data: The buffer to store the 16-bit read. | 157 | * @data: The buffer to store the 16-bit read. |
158 | * Returns | 158 | * Returns: |
159 | * 0: Successfully | 159 | * 0: Successfully |
160 | * Negative value: Failed | 160 | * Negative value: Failed |
161 | */ | 161 | */ |
@@ -172,7 +172,7 @@ inline s32 pch_gbe_hal_read_phy_reg(struct pch_gbe_hw *hw, u32 offset, | |||
172 | * @hw: Pointer to the HW structure | 172 | * @hw: Pointer to the HW structure |
173 | * @offset: The register to read | 173 | * @offset: The register to read |
174 | * @data: The value to write. | 174 | * @data: The value to write. |
175 | * Returns | 175 | * Returns: |
176 | * 0: Successfully | 176 | * 0: Successfully |
177 | * Negative value: Failed | 177 | * Negative value: Failed |
178 | */ | 178 | */ |
@@ -211,7 +211,7 @@ inline void pch_gbe_hal_phy_sw_reset(struct pch_gbe_hw *hw) | |||
211 | /** | 211 | /** |
212 | * pch_gbe_hal_read_mac_addr - Reads MAC address | 212 | * pch_gbe_hal_read_mac_addr - Reads MAC address |
213 | * @hw: Pointer to the HW structure | 213 | * @hw: Pointer to the HW structure |
214 | * Returns | 214 | * Returns: |
215 | * 0: Successfully | 215 | * 0: Successfully |
216 | * ENOSYS: Function is not registered | 216 | * ENOSYS: Function is not registered |
217 | */ | 217 | */ |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c index ac4e72d529e5..9dbf38c10a68 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | |||
@@ -77,7 +77,7 @@ static const struct pch_gbe_stats pch_gbe_gstrings_stats[] = { | |||
77 | * pch_gbe_get_settings - Get device-specific settings | 77 | * pch_gbe_get_settings - Get device-specific settings |
78 | * @netdev: Network interface device structure | 78 | * @netdev: Network interface device structure |
79 | * @ecmd: Ethtool command | 79 | * @ecmd: Ethtool command |
80 | * Returns | 80 | * Returns: |
81 | * 0: Successful. | 81 | * 0: Successful. |
82 | * Negative value: Failed. | 82 | * Negative value: Failed. |
83 | */ | 83 | */ |
@@ -100,7 +100,7 @@ static int pch_gbe_get_settings(struct net_device *netdev, | |||
100 | * pch_gbe_set_settings - Set device-specific settings | 100 | * pch_gbe_set_settings - Set device-specific settings |
101 | * @netdev: Network interface device structure | 101 | * @netdev: Network interface device structure |
102 | * @ecmd: Ethtool command | 102 | * @ecmd: Ethtool command |
103 | * Returns | 103 | * Returns: |
104 | * 0: Successful. | 104 | * 0: Successful. |
105 | * Negative value: Failed. | 105 | * Negative value: Failed. |
106 | */ | 106 | */ |
@@ -220,7 +220,7 @@ static void pch_gbe_get_wol(struct net_device *netdev, | |||
220 | * pch_gbe_set_wol - Turn Wake-on-Lan on or off | 220 | * pch_gbe_set_wol - Turn Wake-on-Lan on or off |
221 | * @netdev: Network interface device structure | 221 | * @netdev: Network interface device structure |
222 | * @wol: Pointer of wake-on-Lan information straucture | 222 | * @wol: Pointer of wake-on-Lan information straucture |
223 | * Returns | 223 | * Returns: |
224 | * 0: Successful. | 224 | * 0: Successful. |
225 | * Negative value: Failed. | 225 | * Negative value: Failed. |
226 | */ | 226 | */ |
@@ -248,7 +248,7 @@ static int pch_gbe_set_wol(struct net_device *netdev, | |||
248 | /** | 248 | /** |
249 | * pch_gbe_nway_reset - Restart autonegotiation | 249 | * pch_gbe_nway_reset - Restart autonegotiation |
250 | * @netdev: Network interface device structure | 250 | * @netdev: Network interface device structure |
251 | * Returns | 251 | * Returns: |
252 | * 0: Successful. | 252 | * 0: Successful. |
253 | * Negative value: Failed. | 253 | * Negative value: Failed. |
254 | */ | 254 | */ |
@@ -398,7 +398,7 @@ static void pch_gbe_get_pauseparam(struct net_device *netdev, | |||
398 | * pch_gbe_set_pauseparam - Set pause paramters | 398 | * pch_gbe_set_pauseparam - Set pause paramters |
399 | * @netdev: Network interface device structure | 399 | * @netdev: Network interface device structure |
400 | * @pause: Pause parameters structure | 400 | * @pause: Pause parameters structure |
401 | * Returns | 401 | * Returns: |
402 | * 0: Successful. | 402 | * 0: Successful. |
403 | * Negative value: Failed. | 403 | * Negative value: Failed. |
404 | */ | 404 | */ |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 3787c64ee71c..b1006563f736 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | |||
@@ -301,7 +301,7 @@ inline void pch_gbe_mac_load_mac_addr(struct pch_gbe_hw *hw) | |||
301 | /** | 301 | /** |
302 | * pch_gbe_mac_read_mac_addr - Read MAC address | 302 | * pch_gbe_mac_read_mac_addr - Read MAC address |
303 | * @hw: Pointer to the HW structure | 303 | * @hw: Pointer to the HW structure |
304 | * Returns | 304 | * Returns: |
305 | * 0: Successful. | 305 | * 0: Successful. |
306 | */ | 306 | */ |
307 | s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw) | 307 | s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw) |
@@ -483,7 +483,7 @@ static void pch_gbe_mac_mc_addr_list_update(struct pch_gbe_hw *hw, | |||
483 | /** | 483 | /** |
484 | * pch_gbe_mac_force_mac_fc - Force the MAC's flow control settings | 484 | * pch_gbe_mac_force_mac_fc - Force the MAC's flow control settings |
485 | * @hw: Pointer to the HW structure | 485 | * @hw: Pointer to the HW structure |
486 | * Returns | 486 | * Returns: |
487 | * 0: Successful. | 487 | * 0: Successful. |
488 | * Negative value: Failed. | 488 | * Negative value: Failed. |
489 | */ | 489 | */ |
@@ -639,7 +639,7 @@ static void pch_gbe_mac_set_pause_packet(struct pch_gbe_hw *hw) | |||
639 | /** | 639 | /** |
640 | * pch_gbe_alloc_queues - Allocate memory for all rings | 640 | * pch_gbe_alloc_queues - Allocate memory for all rings |
641 | * @adapter: Board private structure to initialize | 641 | * @adapter: Board private structure to initialize |
642 | * Returns | 642 | * Returns: |
643 | * 0: Successfully | 643 | * 0: Successfully |
644 | * Negative value: Failed | 644 | * Negative value: Failed |
645 | */ | 645 | */ |
@@ -670,7 +670,7 @@ static void pch_gbe_init_stats(struct pch_gbe_adapter *adapter) | |||
670 | /** | 670 | /** |
671 | * pch_gbe_init_phy - Initialize PHY | 671 | * pch_gbe_init_phy - Initialize PHY |
672 | * @adapter: Board private structure to initialize | 672 | * @adapter: Board private structure to initialize |
673 | * Returns | 673 | * Returns: |
674 | * 0: Successfully | 674 | * 0: Successfully |
675 | * Negative value: Failed | 675 | * Negative value: Failed |
676 | */ | 676 | */ |
@@ -720,7 +720,7 @@ static int pch_gbe_init_phy(struct pch_gbe_adapter *adapter) | |||
720 | * @netdev: Network interface device structure | 720 | * @netdev: Network interface device structure |
721 | * @addr: Phy ID | 721 | * @addr: Phy ID |
722 | * @reg: Access location | 722 | * @reg: Access location |
723 | * Returns | 723 | * Returns: |
724 | * 0: Successfully | 724 | * 0: Successfully |
725 | * Negative value: Failed | 725 | * Negative value: Failed |
726 | */ | 726 | */ |
@@ -1364,7 +1364,7 @@ static void pch_gbe_start_receive(struct pch_gbe_hw *hw) | |||
1364 | * pch_gbe_intr - Interrupt Handler | 1364 | * pch_gbe_intr - Interrupt Handler |
1365 | * @irq: Interrupt number | 1365 | * @irq: Interrupt number |
1366 | * @data: Pointer to a network interface device structure | 1366 | * @data: Pointer to a network interface device structure |
1367 | * Returns | 1367 | * Returns: |
1368 | * - IRQ_HANDLED: Our interrupt | 1368 | * - IRQ_HANDLED: Our interrupt |
1369 | * - IRQ_NONE: Not our interrupt | 1369 | * - IRQ_NONE: Not our interrupt |
1370 | */ | 1370 | */ |
@@ -1566,7 +1566,7 @@ static void pch_gbe_alloc_tx_buffers(struct pch_gbe_adapter *adapter, | |||
1566 | * pch_gbe_clean_tx - Reclaim resources after transmit completes | 1566 | * pch_gbe_clean_tx - Reclaim resources after transmit completes |
1567 | * @adapter: Board private structure | 1567 | * @adapter: Board private structure |
1568 | * @tx_ring: Tx descriptor ring | 1568 | * @tx_ring: Tx descriptor ring |
1569 | * Returns | 1569 | * Returns: |
1570 | * true: Cleaned the descriptor | 1570 | * true: Cleaned the descriptor |
1571 | * false: Not cleaned the descriptor | 1571 | * false: Not cleaned the descriptor |
1572 | */ | 1572 | */ |
@@ -1660,7 +1660,7 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter, | |||
1660 | * @rx_ring: Rx descriptor ring | 1660 | * @rx_ring: Rx descriptor ring |
1661 | * @work_done: Completed count | 1661 | * @work_done: Completed count |
1662 | * @work_to_do: Request count | 1662 | * @work_to_do: Request count |
1663 | * Returns | 1663 | * Returns: |
1664 | * true: Cleaned the descriptor | 1664 | * true: Cleaned the descriptor |
1665 | * false: Not cleaned the descriptor | 1665 | * false: Not cleaned the descriptor |
1666 | */ | 1666 | */ |
@@ -1775,7 +1775,7 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter, | |||
1775 | * pch_gbe_setup_tx_resources - Allocate Tx resources (Descriptors) | 1775 | * pch_gbe_setup_tx_resources - Allocate Tx resources (Descriptors) |
1776 | * @adapter: Board private structure | 1776 | * @adapter: Board private structure |
1777 | * @tx_ring: Tx descriptor ring (for a specific queue) to setup | 1777 | * @tx_ring: Tx descriptor ring (for a specific queue) to setup |
1778 | * Returns | 1778 | * Returns: |
1779 | * 0: Successfully | 1779 | * 0: Successfully |
1780 | * Negative value: Failed | 1780 | * Negative value: Failed |
1781 | */ | 1781 | */ |
@@ -1822,7 +1822,7 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter, | |||
1822 | * pch_gbe_setup_rx_resources - Allocate Rx resources (Descriptors) | 1822 | * pch_gbe_setup_rx_resources - Allocate Rx resources (Descriptors) |
1823 | * @adapter: Board private structure | 1823 | * @adapter: Board private structure |
1824 | * @rx_ring: Rx descriptor ring (for a specific queue) to setup | 1824 | * @rx_ring: Rx descriptor ring (for a specific queue) to setup |
1825 | * Returns | 1825 | * Returns: |
1826 | * 0: Successfully | 1826 | * 0: Successfully |
1827 | * Negative value: Failed | 1827 | * Negative value: Failed |
1828 | */ | 1828 | */ |
@@ -1899,7 +1899,7 @@ void pch_gbe_free_rx_resources(struct pch_gbe_adapter *adapter, | |||
1899 | /** | 1899 | /** |
1900 | * pch_gbe_request_irq - Allocate an interrupt line | 1900 | * pch_gbe_request_irq - Allocate an interrupt line |
1901 | * @adapter: Board private structure | 1901 | * @adapter: Board private structure |
1902 | * Returns | 1902 | * Returns: |
1903 | * 0: Successfully | 1903 | * 0: Successfully |
1904 | * Negative value: Failed | 1904 | * Negative value: Failed |
1905 | */ | 1905 | */ |
@@ -1932,7 +1932,7 @@ static int pch_gbe_request_irq(struct pch_gbe_adapter *adapter) | |||
1932 | /** | 1932 | /** |
1933 | * pch_gbe_up - Up GbE network device | 1933 | * pch_gbe_up - Up GbE network device |
1934 | * @adapter: Board private structure | 1934 | * @adapter: Board private structure |
1935 | * Returns | 1935 | * Returns: |
1936 | * 0: Successfully | 1936 | * 0: Successfully |
1937 | * Negative value: Failed | 1937 | * Negative value: Failed |
1938 | */ | 1938 | */ |
@@ -2018,7 +2018,7 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter) | |||
2018 | /** | 2018 | /** |
2019 | * pch_gbe_sw_init - Initialize general software structures (struct pch_gbe_adapter) | 2019 | * pch_gbe_sw_init - Initialize general software structures (struct pch_gbe_adapter) |
2020 | * @adapter: Board private structure to initialize | 2020 | * @adapter: Board private structure to initialize |
2021 | * Returns | 2021 | * Returns: |
2022 | * 0: Successfully | 2022 | * 0: Successfully |
2023 | * Negative value: Failed | 2023 | * Negative value: Failed |
2024 | */ | 2024 | */ |
@@ -2057,7 +2057,7 @@ static int pch_gbe_sw_init(struct pch_gbe_adapter *adapter) | |||
2057 | /** | 2057 | /** |
2058 | * pch_gbe_open - Called when a network interface is made active | 2058 | * pch_gbe_open - Called when a network interface is made active |
2059 | * @netdev: Network interface device structure | 2059 | * @netdev: Network interface device structure |
2060 | * Returns | 2060 | * Returns: |
2061 | * 0: Successfully | 2061 | * 0: Successfully |
2062 | * Negative value: Failed | 2062 | * Negative value: Failed |
2063 | */ | 2063 | */ |
@@ -2097,7 +2097,7 @@ err_setup_tx: | |||
2097 | /** | 2097 | /** |
2098 | * pch_gbe_stop - Disables a network interface | 2098 | * pch_gbe_stop - Disables a network interface |
2099 | * @netdev: Network interface device structure | 2099 | * @netdev: Network interface device structure |
2100 | * Returns | 2100 | * Returns: |
2101 | * 0: Successfully | 2101 | * 0: Successfully |
2102 | */ | 2102 | */ |
2103 | static int pch_gbe_stop(struct net_device *netdev) | 2103 | static int pch_gbe_stop(struct net_device *netdev) |
@@ -2117,7 +2117,7 @@ static int pch_gbe_stop(struct net_device *netdev) | |||
2117 | * pch_gbe_xmit_frame - Packet transmitting start | 2117 | * pch_gbe_xmit_frame - Packet transmitting start |
2118 | * @skb: Socket buffer structure | 2118 | * @skb: Socket buffer structure |
2119 | * @netdev: Network interface device structure | 2119 | * @netdev: Network interface device structure |
2120 | * Returns | 2120 | * Returns: |
2121 | * - NETDEV_TX_OK: Normal end | 2121 | * - NETDEV_TX_OK: Normal end |
2122 | * - NETDEV_TX_BUSY: Error end | 2122 | * - NETDEV_TX_BUSY: Error end |
2123 | */ | 2123 | */ |
@@ -2225,7 +2225,7 @@ static void pch_gbe_set_multi(struct net_device *netdev) | |||
2225 | * pch_gbe_set_mac - Change the Ethernet Address of the NIC | 2225 | * pch_gbe_set_mac - Change the Ethernet Address of the NIC |
2226 | * @netdev: Network interface device structure | 2226 | * @netdev: Network interface device structure |
2227 | * @addr: Pointer to an address structure | 2227 | * @addr: Pointer to an address structure |
2228 | * Returns | 2228 | * Returns: |
2229 | * 0: Successfully | 2229 | * 0: Successfully |
2230 | * -EADDRNOTAVAIL: Failed | 2230 | * -EADDRNOTAVAIL: Failed |
2231 | */ | 2231 | */ |
@@ -2256,7 +2256,7 @@ static int pch_gbe_set_mac(struct net_device *netdev, void *addr) | |||
2256 | * pch_gbe_change_mtu - Change the Maximum Transfer Unit | 2256 | * pch_gbe_change_mtu - Change the Maximum Transfer Unit |
2257 | * @netdev: Network interface device structure | 2257 | * @netdev: Network interface device structure |
2258 | * @new_mtu: New value for maximum frame size | 2258 | * @new_mtu: New value for maximum frame size |
2259 | * Returns | 2259 | * Returns: |
2260 | * 0: Successfully | 2260 | * 0: Successfully |
2261 | * -EINVAL: Failed | 2261 | * -EINVAL: Failed |
2262 | */ | 2262 | */ |
@@ -2309,7 +2309,7 @@ static int pch_gbe_change_mtu(struct net_device *netdev, int new_mtu) | |||
2309 | * pch_gbe_set_features - Reset device after features changed | 2309 | * pch_gbe_set_features - Reset device after features changed |
2310 | * @netdev: Network interface device structure | 2310 | * @netdev: Network interface device structure |
2311 | * @features: New features | 2311 | * @features: New features |
2312 | * Returns | 2312 | * Returns: |
2313 | * 0: HW state updated successfully | 2313 | * 0: HW state updated successfully |
2314 | */ | 2314 | */ |
2315 | static int pch_gbe_set_features(struct net_device *netdev, | 2315 | static int pch_gbe_set_features(struct net_device *netdev, |
@@ -2334,7 +2334,7 @@ static int pch_gbe_set_features(struct net_device *netdev, | |||
2334 | * @netdev: Network interface device structure | 2334 | * @netdev: Network interface device structure |
2335 | * @ifr: Pointer to ifr structure | 2335 | * @ifr: Pointer to ifr structure |
2336 | * @cmd: Control command | 2336 | * @cmd: Control command |
2337 | * Returns | 2337 | * Returns: |
2338 | * 0: Successfully | 2338 | * 0: Successfully |
2339 | * Negative value: Failed | 2339 | * Negative value: Failed |
2340 | */ | 2340 | */ |
@@ -2369,7 +2369,7 @@ static void pch_gbe_tx_timeout(struct net_device *netdev) | |||
2369 | * pch_gbe_napi_poll - NAPI receive and transfer polling callback | 2369 | * pch_gbe_napi_poll - NAPI receive and transfer polling callback |
2370 | * @napi: Pointer of polling device struct | 2370 | * @napi: Pointer of polling device struct |
2371 | * @budget: The maximum number of a packet | 2371 | * @budget: The maximum number of a packet |
2372 | * Returns | 2372 | * Returns: |
2373 | * false: Exit the polling mode | 2373 | * false: Exit the polling mode |
2374 | * true: Continue the polling mode | 2374 | * true: Continue the polling mode |
2375 | */ | 2375 | */ |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c index 29e23bec809c..8653c3b81f84 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | |||
@@ -139,7 +139,7 @@ MODULE_PARM_DESC(XsumTX, "Disable or enable Transmit Checksum offload"); | |||
139 | /** | 139 | /** |
140 | * pch_gbe_option - Force the MAC's flow control settings | 140 | * pch_gbe_option - Force the MAC's flow control settings |
141 | * @hw: Pointer to the HW structure | 141 | * @hw: Pointer to the HW structure |
142 | * Returns | 142 | * Returns: |
143 | * 0: Successful. | 143 | * 0: Successful. |
144 | * Negative value: Failed. | 144 | * Negative value: Failed. |
145 | */ | 145 | */ |
@@ -220,7 +220,7 @@ static const struct pch_gbe_opt_list fc_list[] = { | |||
220 | * @value: value | 220 | * @value: value |
221 | * @opt: option | 221 | * @opt: option |
222 | * @adapter: Board private structure | 222 | * @adapter: Board private structure |
223 | * Returns | 223 | * Returns: |
224 | * 0: Successful. | 224 | * 0: Successful. |
225 | * Negative value: Failed. | 225 | * Negative value: Failed. |
226 | */ | 226 | */ |
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 0e575359af17..a1965c07d1e3 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h | |||
@@ -527,7 +527,7 @@ struct efx_phy_operations { | |||
527 | }; | 527 | }; |
528 | 528 | ||
529 | /** | 529 | /** |
530 | * @enum efx_phy_mode - PHY operating mode flags | 530 | * enum efx_phy_mode - PHY operating mode flags |
531 | * @PHY_MODE_NORMAL: on and should pass traffic | 531 | * @PHY_MODE_NORMAL: on and should pass traffic |
532 | * @PHY_MODE_TX_DISABLED: on with TX disabled | 532 | * @PHY_MODE_TX_DISABLED: on with TX disabled |
533 | * @PHY_MODE_LOW_POWER: set to low power through MDIO | 533 | * @PHY_MODE_LOW_POWER: set to low power through MDIO |
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index 243e91f3dff9..fca61fea38e0 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c | |||
@@ -336,6 +336,7 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel, | |||
336 | /** | 336 | /** |
337 | * efx_fast_push_rx_descriptors - push new RX descriptors quickly | 337 | * efx_fast_push_rx_descriptors - push new RX descriptors quickly |
338 | * @rx_queue: RX descriptor queue | 338 | * @rx_queue: RX descriptor queue |
339 | * | ||
339 | * This will aim to fill the RX descriptor queue up to | 340 | * This will aim to fill the RX descriptor queue up to |
340 | * @rx_queue->@max_fill. If there is insufficient atomic | 341 | * @rx_queue->@max_fill. If there is insufficient atomic |
341 | * memory to do so, a slow fill will be scheduled. | 342 | * memory to do so, a slow fill will be scheduled. |
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 8814b2f5d46f..8d15f7a74b45 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c | |||
@@ -773,7 +773,7 @@ static int smc911x_phy_fixed(struct net_device *dev) | |||
773 | return 1; | 773 | return 1; |
774 | } | 774 | } |
775 | 775 | ||
776 | /* | 776 | /** |
777 | * smc911x_phy_reset - reset the phy | 777 | * smc911x_phy_reset - reset the phy |
778 | * @dev: net device | 778 | * @dev: net device |
779 | * @phy: phy address | 779 | * @phy: phy address |
@@ -819,7 +819,7 @@ static int smc911x_phy_reset(struct net_device *dev, int phy) | |||
819 | return reg & PMT_CTRL_PHY_RST_; | 819 | return reg & PMT_CTRL_PHY_RST_; |
820 | } | 820 | } |
821 | 821 | ||
822 | /* | 822 | /** |
823 | * smc911x_phy_powerdown - powerdown phy | 823 | * smc911x_phy_powerdown - powerdown phy |
824 | * @dev: net device | 824 | * @dev: net device |
825 | * @phy: phy address | 825 | * @phy: phy address |
@@ -837,7 +837,7 @@ static void smc911x_phy_powerdown(struct net_device *dev, int phy) | |||
837 | SMC_SET_PHY_BMCR(lp, phy, bmcr); | 837 | SMC_SET_PHY_BMCR(lp, phy, bmcr); |
838 | } | 838 | } |
839 | 839 | ||
840 | /* | 840 | /** |
841 | * smc911x_phy_check_media - check the media status and adjust BMCR | 841 | * smc911x_phy_check_media - check the media status and adjust BMCR |
842 | * @dev: net device | 842 | * @dev: net device |
843 | * @init: set true for initialisation | 843 | * @init: set true for initialisation |
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index fee449355014..318adc935a53 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -942,7 +942,7 @@ static int smc_phy_fixed(struct net_device *dev) | |||
942 | return 1; | 942 | return 1; |
943 | } | 943 | } |
944 | 944 | ||
945 | /* | 945 | /** |
946 | * smc_phy_reset - reset the phy | 946 | * smc_phy_reset - reset the phy |
947 | * @dev: net device | 947 | * @dev: net device |
948 | * @phy: phy address | 948 | * @phy: phy address |
@@ -976,7 +976,7 @@ static int smc_phy_reset(struct net_device *dev, int phy) | |||
976 | return bmcr & BMCR_RESET; | 976 | return bmcr & BMCR_RESET; |
977 | } | 977 | } |
978 | 978 | ||
979 | /* | 979 | /** |
980 | * smc_phy_powerdown - powerdown phy | 980 | * smc_phy_powerdown - powerdown phy |
981 | * @dev: net device | 981 | * @dev: net device |
982 | * | 982 | * |
@@ -1000,7 +1000,7 @@ static void smc_phy_powerdown(struct net_device *dev) | |||
1000 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); | 1000 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); |
1001 | } | 1001 | } |
1002 | 1002 | ||
1003 | /* | 1003 | /** |
1004 | * smc_phy_check_media - check the media status and adjust TCR | 1004 | * smc_phy_check_media - check the media status and adjust TCR |
1005 | * @dev: net device | 1005 | * @dev: net device |
1006 | * @init: set true for initialisation | 1006 | * @init: set true for initialisation |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index cf826e6b6aa1..13afb8edfadc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | |||
@@ -125,7 +125,7 @@ err_out_req_reg_failed: | |||
125 | } | 125 | } |
126 | 126 | ||
127 | /** | 127 | /** |
128 | * stmmac_dvr_remove | 128 | * stmmac_pci_remove |
129 | * | 129 | * |
130 | * @pdev: platform device pointer | 130 | * @pdev: platform device pointer |
131 | * Description: this function calls the main to free the net resources | 131 | * Description: this function calls the main to free the net resources |
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index 447a6932cab3..6ce9edd95c04 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c | |||
@@ -137,14 +137,15 @@ static void print_eth_id(struct net_device *ndev) | |||
137 | #define bdx_disable_interrupts(priv) \ | 137 | #define bdx_disable_interrupts(priv) \ |
138 | do { WRITE_REG(priv, regIMR, 0); } while (0) | 138 | do { WRITE_REG(priv, regIMR, 0); } while (0) |
139 | 139 | ||
140 | /* bdx_fifo_init | 140 | /** |
141 | * create TX/RX descriptor fifo for host-NIC communication. | 141 | * bdx_fifo_init - create TX/RX descriptor fifo for host-NIC communication. |
142 | * @priv: NIC private structure | ||
143 | * @f: fifo to initialize | ||
144 | * @fsz_type: fifo size type: 0-4KB, 1-8KB, 2-16KB, 3-32KB | ||
145 | * @reg_XXX: offsets of registers relative to base address | ||
146 | * | ||
142 | * 1K extra space is allocated at the end of the fifo to simplify | 147 | * 1K extra space is allocated at the end of the fifo to simplify |
143 | * processing of descriptors that wraps around fifo's end | 148 | * processing of descriptors that wraps around fifo's end |
144 | * @priv - NIC private structure | ||
145 | * @f - fifo to initialize | ||
146 | * @fsz_type - fifo size type: 0-4KB, 1-8KB, 2-16KB, 3-32KB | ||
147 | * @reg_XXX - offsets of registers relative to base address | ||
148 | * | 149 | * |
149 | * Returns 0 on success, negative value on failure | 150 | * Returns 0 on success, negative value on failure |
150 | * | 151 | * |
@@ -177,9 +178,10 @@ bdx_fifo_init(struct bdx_priv *priv, struct fifo *f, int fsz_type, | |||
177 | RET(0); | 178 | RET(0); |
178 | } | 179 | } |
179 | 180 | ||
180 | /* bdx_fifo_free - free all resources used by fifo | 181 | /** |
181 | * @priv - NIC private structure | 182 | * bdx_fifo_free - free all resources used by fifo |
182 | * @f - fifo to release | 183 | * @priv: NIC private structure |
184 | * @f: fifo to release | ||
183 | */ | 185 | */ |
184 | static void bdx_fifo_free(struct bdx_priv *priv, struct fifo *f) | 186 | static void bdx_fifo_free(struct bdx_priv *priv, struct fifo *f) |
185 | { | 187 | { |
@@ -192,9 +194,9 @@ static void bdx_fifo_free(struct bdx_priv *priv, struct fifo *f) | |||
192 | RET(); | 194 | RET(); |
193 | } | 195 | } |
194 | 196 | ||
195 | /* | 197 | /** |
196 | * bdx_link_changed - notifies OS about hw link state. | 198 | * bdx_link_changed - notifies OS about hw link state. |
197 | * @bdx_priv - hw adapter structure | 199 | * @priv: hw adapter structure |
198 | */ | 200 | */ |
199 | static void bdx_link_changed(struct bdx_priv *priv) | 201 | static void bdx_link_changed(struct bdx_priv *priv) |
200 | { | 202 | { |
@@ -233,10 +235,10 @@ static void bdx_isr_extra(struct bdx_priv *priv, u32 isr) | |||
233 | 235 | ||
234 | } | 236 | } |
235 | 237 | ||
236 | /* bdx_isr - Interrupt Service Routine for Bordeaux NIC | 238 | /** |
237 | * @irq - interrupt number | 239 | * bdx_isr_napi - Interrupt Service Routine for Bordeaux NIC |
238 | * @ndev - network device | 240 | * @irq: interrupt number |
239 | * @regs - CPU registers | 241 | * @dev: network device |
240 | * | 242 | * |
241 | * Return IRQ_NONE if it was not our interrupt, IRQ_HANDLED - otherwise | 243 | * Return IRQ_NONE if it was not our interrupt, IRQ_HANDLED - otherwise |
242 | * | 244 | * |
@@ -307,8 +309,10 @@ static int bdx_poll(struct napi_struct *napi, int budget) | |||
307 | return work_done; | 309 | return work_done; |
308 | } | 310 | } |
309 | 311 | ||
310 | /* bdx_fw_load - loads firmware to NIC | 312 | /** |
311 | * @priv - NIC private structure | 313 | * bdx_fw_load - loads firmware to NIC |
314 | * @priv: NIC private structure | ||
315 | * | ||
312 | * Firmware is loaded via TXD fifo, so it must be initialized first. | 316 | * Firmware is loaded via TXD fifo, so it must be initialized first. |
313 | * Firware must be loaded once per NIC not per PCI device provided by NIC (NIC | 317 | * Firware must be loaded once per NIC not per PCI device provided by NIC (NIC |
314 | * can have few of them). So all drivers use semaphore register to choose one | 318 | * can have few of them). So all drivers use semaphore register to choose one |
@@ -380,8 +384,9 @@ static void bdx_restore_mac(struct net_device *ndev, struct bdx_priv *priv) | |||
380 | RET(); | 384 | RET(); |
381 | } | 385 | } |
382 | 386 | ||
383 | /* bdx_hw_start - inits registers and starts HW's Rx and Tx engines | 387 | /** |
384 | * @priv - NIC private structure | 388 | * bdx_hw_start - inits registers and starts HW's Rx and Tx engines |
389 | * @priv: NIC private structure | ||
385 | */ | 390 | */ |
386 | static int bdx_hw_start(struct bdx_priv *priv) | 391 | static int bdx_hw_start(struct bdx_priv *priv) |
387 | { | 392 | { |
@@ -691,12 +696,13 @@ static int bdx_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) | |||
691 | RET(-EOPNOTSUPP); | 696 | RET(-EOPNOTSUPP); |
692 | } | 697 | } |
693 | 698 | ||
694 | /* | 699 | /** |
695 | * __bdx_vlan_rx_vid - private helper for adding/killing VLAN vid | 700 | * __bdx_vlan_rx_vid - private helper for adding/killing VLAN vid |
696 | * by passing VLAN filter table to hardware | 701 | * @ndev: network device |
697 | * @ndev network device | 702 | * @vid: VLAN vid |
698 | * @vid VLAN vid | 703 | * @op: add or kill operation |
699 | * @op add or kill operation | 704 | * |
705 | * Passes VLAN filter table to hardware | ||
700 | */ | 706 | */ |
701 | static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable) | 707 | static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable) |
702 | { | 708 | { |
@@ -722,10 +728,10 @@ static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable) | |||
722 | RET(); | 728 | RET(); |
723 | } | 729 | } |
724 | 730 | ||
725 | /* | 731 | /** |
726 | * bdx_vlan_rx_add_vid - kernel hook for adding VLAN vid to hw filtering table | 732 | * bdx_vlan_rx_add_vid - kernel hook for adding VLAN vid to hw filtering table |
727 | * @ndev network device | 733 | * @ndev: network device |
728 | * @vid VLAN vid to add | 734 | * @vid: VLAN vid to add |
729 | */ | 735 | */ |
730 | static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid) | 736 | static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid) |
731 | { | 737 | { |
@@ -733,10 +739,10 @@ static int bdx_vlan_rx_add_vid(struct net_device *ndev, uint16_t vid) | |||
733 | return 0; | 739 | return 0; |
734 | } | 740 | } |
735 | 741 | ||
736 | /* | 742 | /** |
737 | * bdx_vlan_rx_kill_vid - kernel hook for killing VLAN vid in hw filtering table | 743 | * bdx_vlan_rx_kill_vid - kernel hook for killing VLAN vid in hw filtering table |
738 | * @ndev network device | 744 | * @ndev: network device |
739 | * @vid VLAN vid to kill | 745 | * @vid: VLAN vid to kill |
740 | */ | 746 | */ |
741 | static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid) | 747 | static int bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid) |
742 | { | 748 | { |
@@ -974,8 +980,9 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n) | |||
974 | * Rx Init * | 980 | * Rx Init * |
975 | *************************************************************************/ | 981 | *************************************************************************/ |
976 | 982 | ||
977 | /* bdx_rx_init - initialize RX all related HW and SW resources | 983 | /** |
978 | * @priv - NIC private structure | 984 | * bdx_rx_init - initialize RX all related HW and SW resources |
985 | * @priv: NIC private structure | ||
979 | * | 986 | * |
980 | * Returns 0 on success, negative value on failure | 987 | * Returns 0 on success, negative value on failure |
981 | * | 988 | * |
@@ -1016,9 +1023,10 @@ err_mem: | |||
1016 | return -ENOMEM; | 1023 | return -ENOMEM; |
1017 | } | 1024 | } |
1018 | 1025 | ||
1019 | /* bdx_rx_free_skbs - frees and unmaps all skbs allocated for the fifo | 1026 | /** |
1020 | * @priv - NIC private structure | 1027 | * bdx_rx_free_skbs - frees and unmaps all skbs allocated for the fifo |
1021 | * @f - RXF fifo | 1028 | * @priv: NIC private structure |
1029 | * @f: RXF fifo | ||
1022 | */ | 1030 | */ |
1023 | static void bdx_rx_free_skbs(struct bdx_priv *priv, struct rxf_fifo *f) | 1031 | static void bdx_rx_free_skbs(struct bdx_priv *priv, struct rxf_fifo *f) |
1024 | { | 1032 | { |
@@ -1045,8 +1053,10 @@ static void bdx_rx_free_skbs(struct bdx_priv *priv, struct rxf_fifo *f) | |||
1045 | } | 1053 | } |
1046 | } | 1054 | } |
1047 | 1055 | ||
1048 | /* bdx_rx_free - release all Rx resources | 1056 | /** |
1049 | * @priv - NIC private structure | 1057 | * bdx_rx_free - release all Rx resources |
1058 | * @priv: NIC private structure | ||
1059 | * | ||
1050 | * It assumes that Rx is desabled in HW | 1060 | * It assumes that Rx is desabled in HW |
1051 | */ | 1061 | */ |
1052 | static void bdx_rx_free(struct bdx_priv *priv) | 1062 | static void bdx_rx_free(struct bdx_priv *priv) |
@@ -1067,9 +1077,11 @@ static void bdx_rx_free(struct bdx_priv *priv) | |||
1067 | * Rx Engine * | 1077 | * Rx Engine * |
1068 | *************************************************************************/ | 1078 | *************************************************************************/ |
1069 | 1079 | ||
1070 | /* bdx_rx_alloc_skbs - fill rxf fifo with new skbs | 1080 | /** |
1071 | * @priv - nic's private structure | 1081 | * bdx_rx_alloc_skbs - fill rxf fifo with new skbs |
1072 | * @f - RXF fifo that needs skbs | 1082 | * @priv: nic's private structure |
1083 | * @f: RXF fifo that needs skbs | ||
1084 | * | ||
1073 | * It allocates skbs, build rxf descs and push it (rxf descr) into rxf fifo. | 1085 | * It allocates skbs, build rxf descs and push it (rxf descr) into rxf fifo. |
1074 | * skb's virtual and physical addresses are stored in skb db. | 1086 | * skb's virtual and physical addresses are stored in skb db. |
1075 | * To calculate free space, func uses cached values of RPTR and WPTR | 1087 | * To calculate free space, func uses cached values of RPTR and WPTR |
@@ -1179,13 +1191,15 @@ static void bdx_recycle_skb(struct bdx_priv *priv, struct rxd_desc *rxdd) | |||
1179 | RET(); | 1191 | RET(); |
1180 | } | 1192 | } |
1181 | 1193 | ||
1182 | /* bdx_rx_receive - receives full packets from RXD fifo and pass them to OS | 1194 | /** |
1195 | * bdx_rx_receive - receives full packets from RXD fifo and pass them to OS | ||
1183 | * NOTE: a special treatment is given to non-continuous descriptors | 1196 | * NOTE: a special treatment is given to non-continuous descriptors |
1184 | * that start near the end, wraps around and continue at the beginning. a second | 1197 | * that start near the end, wraps around and continue at the beginning. a second |
1185 | * part is copied right after the first, and then descriptor is interpreted as | 1198 | * part is copied right after the first, and then descriptor is interpreted as |
1186 | * normal. fifo has an extra space to allow such operations | 1199 | * normal. fifo has an extra space to allow such operations |
1187 | * @priv - nic's private structure | 1200 | * @priv: nic's private structure |
1188 | * @f - RXF fifo that needs skbs | 1201 | * @f: RXF fifo that needs skbs |
1202 | * @budget: maximum number of packets to receive | ||
1189 | */ | 1203 | */ |
1190 | 1204 | ||
1191 | /* TBD: replace memcpy func call by explicite inline asm */ | 1205 | /* TBD: replace memcpy func call by explicite inline asm */ |
@@ -1375,9 +1389,10 @@ static inline int bdx_tx_db_size(struct txdb *db) | |||
1375 | return db->size - taken; | 1389 | return db->size - taken; |
1376 | } | 1390 | } |
1377 | 1391 | ||
1378 | /* __bdx_tx_ptr_next - helper function, increment read/write pointer + wrap | 1392 | /** |
1379 | * @d - tx data base | 1393 | * __bdx_tx_db_ptr_next - helper function, increment read/write pointer + wrap |
1380 | * @ptr - read or write pointer | 1394 | * @db: tx data base |
1395 | * @pptr: read or write pointer | ||
1381 | */ | 1396 | */ |
1382 | static inline void __bdx_tx_db_ptr_next(struct txdb *db, struct tx_map **pptr) | 1397 | static inline void __bdx_tx_db_ptr_next(struct txdb *db, struct tx_map **pptr) |
1383 | { | 1398 | { |
@@ -1394,8 +1409,9 @@ static inline void __bdx_tx_db_ptr_next(struct txdb *db, struct tx_map **pptr) | |||
1394 | *pptr = db->start; | 1409 | *pptr = db->start; |
1395 | } | 1410 | } |
1396 | 1411 | ||
1397 | /* bdx_tx_db_inc_rptr - increment read pointer | 1412 | /** |
1398 | * @d - tx data base | 1413 | * bdx_tx_db_inc_rptr - increment read pointer |
1414 | * @db: tx data base | ||
1399 | */ | 1415 | */ |
1400 | static inline void bdx_tx_db_inc_rptr(struct txdb *db) | 1416 | static inline void bdx_tx_db_inc_rptr(struct txdb *db) |
1401 | { | 1417 | { |
@@ -1403,8 +1419,9 @@ static inline void bdx_tx_db_inc_rptr(struct txdb *db) | |||
1403 | __bdx_tx_db_ptr_next(db, &db->rptr); | 1419 | __bdx_tx_db_ptr_next(db, &db->rptr); |
1404 | } | 1420 | } |
1405 | 1421 | ||
1406 | /* bdx_tx_db_inc_rptr - increment write pointer | 1422 | /** |
1407 | * @d - tx data base | 1423 | * bdx_tx_db_inc_wptr - increment write pointer |
1424 | * @db: tx data base | ||
1408 | */ | 1425 | */ |
1409 | static inline void bdx_tx_db_inc_wptr(struct txdb *db) | 1426 | static inline void bdx_tx_db_inc_wptr(struct txdb *db) |
1410 | { | 1427 | { |
@@ -1413,9 +1430,11 @@ static inline void bdx_tx_db_inc_wptr(struct txdb *db) | |||
1413 | a result of write */ | 1430 | a result of write */ |
1414 | } | 1431 | } |
1415 | 1432 | ||
1416 | /* bdx_tx_db_init - creates and initializes tx db | 1433 | /** |
1417 | * @d - tx data base | 1434 | * bdx_tx_db_init - creates and initializes tx db |
1418 | * @sz_type - size of tx fifo | 1435 | * @d: tx data base |
1436 | * @sz_type: size of tx fifo | ||
1437 | * | ||
1419 | * Returns 0 on success, error code otherwise | 1438 | * Returns 0 on success, error code otherwise |
1420 | */ | 1439 | */ |
1421 | static int bdx_tx_db_init(struct txdb *d, int sz_type) | 1440 | static int bdx_tx_db_init(struct txdb *d, int sz_type) |
@@ -1441,8 +1460,9 @@ static int bdx_tx_db_init(struct txdb *d, int sz_type) | |||
1441 | return 0; | 1460 | return 0; |
1442 | } | 1461 | } |
1443 | 1462 | ||
1444 | /* bdx_tx_db_close - closes tx db and frees all memory | 1463 | /** |
1445 | * @d - tx data base | 1464 | * bdx_tx_db_close - closes tx db and frees all memory |
1465 | * @d: tx data base | ||
1446 | */ | 1466 | */ |
1447 | static void bdx_tx_db_close(struct txdb *d) | 1467 | static void bdx_tx_db_close(struct txdb *d) |
1448 | { | 1468 | { |
@@ -1463,9 +1483,11 @@ static struct { | |||
1463 | u16 qwords; /* qword = 64 bit */ | 1483 | u16 qwords; /* qword = 64 bit */ |
1464 | } txd_sizes[MAX_SKB_FRAGS + 1]; | 1484 | } txd_sizes[MAX_SKB_FRAGS + 1]; |
1465 | 1485 | ||
1466 | /* txdb_map_skb - creates and stores dma mappings for skb's data blocks | 1486 | /** |
1467 | * @priv - NIC private structure | 1487 | * bdx_tx_map_skb - creates and stores dma mappings for skb's data blocks |
1468 | * @skb - socket buffer to map | 1488 | * @priv: NIC private structure |
1489 | * @skb: socket buffer to map | ||
1490 | * @txdd: TX descriptor to use | ||
1469 | * | 1491 | * |
1470 | * It makes dma mappings for skb's data blocks and writes them to PBL of | 1492 | * It makes dma mappings for skb's data blocks and writes them to PBL of |
1471 | * new tx descriptor. It also stores them in the tx db, so they could be | 1493 | * new tx descriptor. It also stores them in the tx db, so they could be |
@@ -1562,9 +1584,10 @@ err_mem: | |||
1562 | return -ENOMEM; | 1584 | return -ENOMEM; |
1563 | } | 1585 | } |
1564 | 1586 | ||
1565 | /* | 1587 | /** |
1566 | * bdx_tx_space - calculates available space in TX fifo | 1588 | * bdx_tx_space - calculates available space in TX fifo |
1567 | * @priv - NIC private structure | 1589 | * @priv: NIC private structure |
1590 | * | ||
1568 | * Returns available space in TX fifo in bytes | 1591 | * Returns available space in TX fifo in bytes |
1569 | */ | 1592 | */ |
1570 | static inline int bdx_tx_space(struct bdx_priv *priv) | 1593 | static inline int bdx_tx_space(struct bdx_priv *priv) |
@@ -1579,9 +1602,10 @@ static inline int bdx_tx_space(struct bdx_priv *priv) | |||
1579 | return fsize; | 1602 | return fsize; |
1580 | } | 1603 | } |
1581 | 1604 | ||
1582 | /* bdx_tx_transmit - send packet to NIC | 1605 | /** |
1583 | * @skb - packet to send | 1606 | * bdx_tx_transmit - send packet to NIC |
1584 | * ndev - network device assigned to NIC | 1607 | * @skb: packet to send |
1608 | * @ndev: network device assigned to NIC | ||
1585 | * Return codes: | 1609 | * Return codes: |
1586 | * o NETDEV_TX_OK everything ok. | 1610 | * o NETDEV_TX_OK everything ok. |
1587 | * o NETDEV_TX_BUSY Cannot transmit packet, try later | 1611 | * o NETDEV_TX_BUSY Cannot transmit packet, try later |
@@ -1699,8 +1723,10 @@ static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb, | |||
1699 | return NETDEV_TX_OK; | 1723 | return NETDEV_TX_OK; |
1700 | } | 1724 | } |
1701 | 1725 | ||
1702 | /* bdx_tx_cleanup - clean TXF fifo, run in the context of IRQ. | 1726 | /** |
1703 | * @priv - bdx adapter | 1727 | * bdx_tx_cleanup - clean TXF fifo, run in the context of IRQ. |
1728 | * @priv: bdx adapter | ||
1729 | * | ||
1704 | * It scans TXF fifo for descriptors, frees DMA mappings and reports to OS | 1730 | * It scans TXF fifo for descriptors, frees DMA mappings and reports to OS |
1705 | * that those packets were sent | 1731 | * that those packets were sent |
1706 | */ | 1732 | */ |
@@ -1761,7 +1787,8 @@ static void bdx_tx_cleanup(struct bdx_priv *priv) | |||
1761 | spin_unlock(&priv->tx_lock); | 1787 | spin_unlock(&priv->tx_lock); |
1762 | } | 1788 | } |
1763 | 1789 | ||
1764 | /* bdx_tx_free_skbs - frees all skbs from TXD fifo. | 1790 | /** |
1791 | * bdx_tx_free_skbs - frees all skbs from TXD fifo. | ||
1765 | * It gets called when OS stops this dev, eg upon "ifconfig down" or rmmod | 1792 | * It gets called when OS stops this dev, eg upon "ifconfig down" or rmmod |
1766 | */ | 1793 | */ |
1767 | static void bdx_tx_free_skbs(struct bdx_priv *priv) | 1794 | static void bdx_tx_free_skbs(struct bdx_priv *priv) |
@@ -1790,10 +1817,11 @@ static void bdx_tx_free(struct bdx_priv *priv) | |||
1790 | bdx_tx_db_close(&priv->txdb); | 1817 | bdx_tx_db_close(&priv->txdb); |
1791 | } | 1818 | } |
1792 | 1819 | ||
1793 | /* bdx_tx_push_desc - push descriptor to TxD fifo | 1820 | /** |
1794 | * @priv - NIC private structure | 1821 | * bdx_tx_push_desc - push descriptor to TxD fifo |
1795 | * @data - desc's data | 1822 | * @priv: NIC private structure |
1796 | * @size - desc's size | 1823 | * @data: desc's data |
1824 | * @size: desc's size | ||
1797 | * | 1825 | * |
1798 | * Pushes desc to TxD fifo and overlaps it if needed. | 1826 | * Pushes desc to TxD fifo and overlaps it if needed. |
1799 | * NOTE: this func does not check for available space. this is responsibility | 1827 | * NOTE: this func does not check for available space. this is responsibility |
@@ -1819,10 +1847,11 @@ static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size) | |||
1819 | WRITE_REG(priv, f->m.reg_WPTR, f->m.wptr & TXF_WPTR_WR_PTR); | 1847 | WRITE_REG(priv, f->m.reg_WPTR, f->m.wptr & TXF_WPTR_WR_PTR); |
1820 | } | 1848 | } |
1821 | 1849 | ||
1822 | /* bdx_tx_push_desc_safe - push descriptor to TxD fifo in a safe way | 1850 | /** |
1823 | * @priv - NIC private structure | 1851 | * bdx_tx_push_desc_safe - push descriptor to TxD fifo in a safe way |
1824 | * @data - desc's data | 1852 | * @priv: NIC private structure |
1825 | * @size - desc's size | 1853 | * @data: desc's data |
1854 | * @size: desc's size | ||
1826 | * | 1855 | * |
1827 | * NOTE: this func does check for available space and, if necessary, waits for | 1856 | * NOTE: this func does check for available space and, if necessary, waits for |
1828 | * NIC to read existing data before writing new one. | 1857 | * NIC to read existing data before writing new one. |
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 4da93a5d7ec6..9cdd6197a176 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
@@ -375,7 +375,7 @@ static char *emac_rxhost_errcodes[16] = { | |||
375 | #define emac_ctrl_write(reg, val) iowrite32(val, (priv->ctrl_base + (reg))) | 375 | #define emac_ctrl_write(reg, val) iowrite32(val, (priv->ctrl_base + (reg))) |
376 | 376 | ||
377 | /** | 377 | /** |
378 | * emac_dump_regs: Dump important EMAC registers to debug terminal | 378 | * emac_dump_regs - Dump important EMAC registers to debug terminal |
379 | * @priv: The DaVinci EMAC private adapter structure | 379 | * @priv: The DaVinci EMAC private adapter structure |
380 | * | 380 | * |
381 | * Executes ethtool set cmd & sets phy mode | 381 | * Executes ethtool set cmd & sets phy mode |
@@ -466,7 +466,7 @@ static void emac_dump_regs(struct emac_priv *priv) | |||
466 | } | 466 | } |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * emac_get_drvinfo: Get EMAC driver information | 469 | * emac_get_drvinfo - Get EMAC driver information |
470 | * @ndev: The DaVinci EMAC network adapter | 470 | * @ndev: The DaVinci EMAC network adapter |
471 | * @info: ethtool info structure containing name and version | 471 | * @info: ethtool info structure containing name and version |
472 | * | 472 | * |
@@ -481,7 +481,7 @@ static void emac_get_drvinfo(struct net_device *ndev, | |||
481 | } | 481 | } |
482 | 482 | ||
483 | /** | 483 | /** |
484 | * emac_get_settings: Get EMAC settings | 484 | * emac_get_settings - Get EMAC settings |
485 | * @ndev: The DaVinci EMAC network adapter | 485 | * @ndev: The DaVinci EMAC network adapter |
486 | * @ecmd: ethtool command | 486 | * @ecmd: ethtool command |
487 | * | 487 | * |
@@ -500,7 +500,7 @@ static int emac_get_settings(struct net_device *ndev, | |||
500 | } | 500 | } |
501 | 501 | ||
502 | /** | 502 | /** |
503 | * emac_set_settings: Set EMAC settings | 503 | * emac_set_settings - Set EMAC settings |
504 | * @ndev: The DaVinci EMAC network adapter | 504 | * @ndev: The DaVinci EMAC network adapter |
505 | * @ecmd: ethtool command | 505 | * @ecmd: ethtool command |
506 | * | 506 | * |
@@ -518,7 +518,7 @@ static int emac_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd) | |||
518 | } | 518 | } |
519 | 519 | ||
520 | /** | 520 | /** |
521 | * emac_get_coalesce : Get interrupt coalesce settings for this device | 521 | * emac_get_coalesce - Get interrupt coalesce settings for this device |
522 | * @ndev : The DaVinci EMAC network adapter | 522 | * @ndev : The DaVinci EMAC network adapter |
523 | * @coal : ethtool coalesce settings structure | 523 | * @coal : ethtool coalesce settings structure |
524 | * | 524 | * |
@@ -536,7 +536,7 @@ static int emac_get_coalesce(struct net_device *ndev, | |||
536 | } | 536 | } |
537 | 537 | ||
538 | /** | 538 | /** |
539 | * emac_set_coalesce : Set interrupt coalesce settings for this device | 539 | * emac_set_coalesce - Set interrupt coalesce settings for this device |
540 | * @ndev : The DaVinci EMAC network adapter | 540 | * @ndev : The DaVinci EMAC network adapter |
541 | * @coal : ethtool coalesce settings structure | 541 | * @coal : ethtool coalesce settings structure |
542 | * | 542 | * |
@@ -631,7 +631,7 @@ static const struct ethtool_ops ethtool_ops = { | |||
631 | }; | 631 | }; |
632 | 632 | ||
633 | /** | 633 | /** |
634 | * emac_update_phystatus: Update Phy status | 634 | * emac_update_phystatus - Update Phy status |
635 | * @priv: The DaVinci EMAC private adapter structure | 635 | * @priv: The DaVinci EMAC private adapter structure |
636 | * | 636 | * |
637 | * Updates phy status and takes action for network queue if required | 637 | * Updates phy status and takes action for network queue if required |
@@ -697,7 +697,7 @@ static void emac_update_phystatus(struct emac_priv *priv) | |||
697 | } | 697 | } |
698 | 698 | ||
699 | /** | 699 | /** |
700 | * hash_get: Calculate hash value from mac address | 700 | * hash_get - Calculate hash value from mac address |
701 | * @addr: mac address to delete from hash table | 701 | * @addr: mac address to delete from hash table |
702 | * | 702 | * |
703 | * Calculates hash value from mac address | 703 | * Calculates hash value from mac address |
@@ -723,9 +723,9 @@ static u32 hash_get(u8 *addr) | |||
723 | } | 723 | } |
724 | 724 | ||
725 | /** | 725 | /** |
726 | * hash_add: Hash function to add mac addr from hash table | 726 | * hash_add - Hash function to add mac addr from hash table |
727 | * @priv: The DaVinci EMAC private adapter structure | 727 | * @priv: The DaVinci EMAC private adapter structure |
728 | * mac_addr: mac address to delete from hash table | 728 | * @mac_addr: mac address to delete from hash table |
729 | * | 729 | * |
730 | * Adds mac address to the internal hash table | 730 | * Adds mac address to the internal hash table |
731 | * | 731 | * |
@@ -765,9 +765,9 @@ static int hash_add(struct emac_priv *priv, u8 *mac_addr) | |||
765 | } | 765 | } |
766 | 766 | ||
767 | /** | 767 | /** |
768 | * hash_del: Hash function to delete mac addr from hash table | 768 | * hash_del - Hash function to delete mac addr from hash table |
769 | * @priv: The DaVinci EMAC private adapter structure | 769 | * @priv: The DaVinci EMAC private adapter structure |
770 | * mac_addr: mac address to delete from hash table | 770 | * @mac_addr: mac address to delete from hash table |
771 | * | 771 | * |
772 | * Removes mac address from the internal hash table | 772 | * Removes mac address from the internal hash table |
773 | * | 773 | * |
@@ -807,7 +807,7 @@ static int hash_del(struct emac_priv *priv, u8 *mac_addr) | |||
807 | #define EMAC_ALL_MULTI_CLR 3 | 807 | #define EMAC_ALL_MULTI_CLR 3 |
808 | 808 | ||
809 | /** | 809 | /** |
810 | * emac_add_mcast: Set multicast address in the EMAC adapter (Internal) | 810 | * emac_add_mcast - Set multicast address in the EMAC adapter (Internal) |
811 | * @priv: The DaVinci EMAC private adapter structure | 811 | * @priv: The DaVinci EMAC private adapter structure |
812 | * @action: multicast operation to perform | 812 | * @action: multicast operation to perform |
813 | * mac_addr: mac address to set | 813 | * mac_addr: mac address to set |
@@ -855,7 +855,7 @@ static void emac_add_mcast(struct emac_priv *priv, u32 action, u8 *mac_addr) | |||
855 | } | 855 | } |
856 | 856 | ||
857 | /** | 857 | /** |
858 | * emac_dev_mcast_set: Set multicast address in the EMAC adapter | 858 | * emac_dev_mcast_set - Set multicast address in the EMAC adapter |
859 | * @ndev: The DaVinci EMAC network adapter | 859 | * @ndev: The DaVinci EMAC network adapter |
860 | * | 860 | * |
861 | * Set multicast addresses in EMAC adapter | 861 | * Set multicast addresses in EMAC adapter |
@@ -901,7 +901,7 @@ static void emac_dev_mcast_set(struct net_device *ndev) | |||
901 | *************************************************************************/ | 901 | *************************************************************************/ |
902 | 902 | ||
903 | /** | 903 | /** |
904 | * emac_int_disable: Disable EMAC module interrupt (from adapter) | 904 | * emac_int_disable - Disable EMAC module interrupt (from adapter) |
905 | * @priv: The DaVinci EMAC private adapter structure | 905 | * @priv: The DaVinci EMAC private adapter structure |
906 | * | 906 | * |
907 | * Disable EMAC interrupt on the adapter | 907 | * Disable EMAC interrupt on the adapter |
@@ -931,7 +931,7 @@ static void emac_int_disable(struct emac_priv *priv) | |||
931 | } | 931 | } |
932 | 932 | ||
933 | /** | 933 | /** |
934 | * emac_int_enable: Enable EMAC module interrupt (from adapter) | 934 | * emac_int_enable - Enable EMAC module interrupt (from adapter) |
935 | * @priv: The DaVinci EMAC private adapter structure | 935 | * @priv: The DaVinci EMAC private adapter structure |
936 | * | 936 | * |
937 | * Enable EMAC interrupt on the adapter | 937 | * Enable EMAC interrupt on the adapter |
@@ -967,7 +967,7 @@ static void emac_int_enable(struct emac_priv *priv) | |||
967 | } | 967 | } |
968 | 968 | ||
969 | /** | 969 | /** |
970 | * emac_irq: EMAC interrupt handler | 970 | * emac_irq - EMAC interrupt handler |
971 | * @irq: interrupt number | 971 | * @irq: interrupt number |
972 | * @dev_id: EMAC network adapter data structure ptr | 972 | * @dev_id: EMAC network adapter data structure ptr |
973 | * | 973 | * |
@@ -1060,7 +1060,7 @@ static void emac_tx_handler(void *token, int len, int status) | |||
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | /** | 1062 | /** |
1063 | * emac_dev_xmit: EMAC Transmit function | 1063 | * emac_dev_xmit - EMAC Transmit function |
1064 | * @skb: SKB pointer | 1064 | * @skb: SKB pointer |
1065 | * @ndev: The DaVinci EMAC network adapter | 1065 | * @ndev: The DaVinci EMAC network adapter |
1066 | * | 1066 | * |
@@ -1111,7 +1111,7 @@ fail_tx: | |||
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | /** | 1113 | /** |
1114 | * emac_dev_tx_timeout: EMAC Transmit timeout function | 1114 | * emac_dev_tx_timeout - EMAC Transmit timeout function |
1115 | * @ndev: The DaVinci EMAC network adapter | 1115 | * @ndev: The DaVinci EMAC network adapter |
1116 | * | 1116 | * |
1117 | * Called when system detects that a skb timeout period has expired | 1117 | * Called when system detects that a skb timeout period has expired |
@@ -1138,7 +1138,7 @@ static void emac_dev_tx_timeout(struct net_device *ndev) | |||
1138 | } | 1138 | } |
1139 | 1139 | ||
1140 | /** | 1140 | /** |
1141 | * emac_set_type0addr: Set EMAC Type0 mac address | 1141 | * emac_set_type0addr - Set EMAC Type0 mac address |
1142 | * @priv: The DaVinci EMAC private adapter structure | 1142 | * @priv: The DaVinci EMAC private adapter structure |
1143 | * @ch: RX channel number | 1143 | * @ch: RX channel number |
1144 | * @mac_addr: MAC address to set in device | 1144 | * @mac_addr: MAC address to set in device |
@@ -1165,7 +1165,7 @@ static void emac_set_type0addr(struct emac_priv *priv, u32 ch, char *mac_addr) | |||
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | /** | 1167 | /** |
1168 | * emac_set_type1addr: Set EMAC Type1 mac address | 1168 | * emac_set_type1addr - Set EMAC Type1 mac address |
1169 | * @priv: The DaVinci EMAC private adapter structure | 1169 | * @priv: The DaVinci EMAC private adapter structure |
1170 | * @ch: RX channel number | 1170 | * @ch: RX channel number |
1171 | * @mac_addr: MAC address to set in device | 1171 | * @mac_addr: MAC address to set in device |
@@ -1187,7 +1187,7 @@ static void emac_set_type1addr(struct emac_priv *priv, u32 ch, char *mac_addr) | |||
1187 | } | 1187 | } |
1188 | 1188 | ||
1189 | /** | 1189 | /** |
1190 | * emac_set_type2addr: Set EMAC Type2 mac address | 1190 | * emac_set_type2addr - Set EMAC Type2 mac address |
1191 | * @priv: The DaVinci EMAC private adapter structure | 1191 | * @priv: The DaVinci EMAC private adapter structure |
1192 | * @ch: RX channel number | 1192 | * @ch: RX channel number |
1193 | * @mac_addr: MAC address to set in device | 1193 | * @mac_addr: MAC address to set in device |
@@ -1213,7 +1213,7 @@ static void emac_set_type2addr(struct emac_priv *priv, u32 ch, | |||
1213 | } | 1213 | } |
1214 | 1214 | ||
1215 | /** | 1215 | /** |
1216 | * emac_setmac: Set mac address in the adapter (internal function) | 1216 | * emac_setmac - Set mac address in the adapter (internal function) |
1217 | * @priv: The DaVinci EMAC private adapter structure | 1217 | * @priv: The DaVinci EMAC private adapter structure |
1218 | * @ch: RX channel number | 1218 | * @ch: RX channel number |
1219 | * @mac_addr: MAC address to set in device | 1219 | * @mac_addr: MAC address to set in device |
@@ -1242,7 +1242,7 @@ static void emac_setmac(struct emac_priv *priv, u32 ch, char *mac_addr) | |||
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | /** | 1244 | /** |
1245 | * emac_dev_setmac_addr: Set mac address in the adapter | 1245 | * emac_dev_setmac_addr - Set mac address in the adapter |
1246 | * @ndev: The DaVinci EMAC network adapter | 1246 | * @ndev: The DaVinci EMAC network adapter |
1247 | * @addr: MAC address to set in device | 1247 | * @addr: MAC address to set in device |
1248 | * | 1248 | * |
@@ -1277,7 +1277,7 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr) | |||
1277 | } | 1277 | } |
1278 | 1278 | ||
1279 | /** | 1279 | /** |
1280 | * emac_hw_enable: Enable EMAC hardware for packet transmission/reception | 1280 | * emac_hw_enable - Enable EMAC hardware for packet transmission/reception |
1281 | * @priv: The DaVinci EMAC private adapter structure | 1281 | * @priv: The DaVinci EMAC private adapter structure |
1282 | * | 1282 | * |
1283 | * Enables EMAC hardware for packet processing - enables PHY, enables RX | 1283 | * Enables EMAC hardware for packet processing - enables PHY, enables RX |
@@ -1347,7 +1347,7 @@ static int emac_hw_enable(struct emac_priv *priv) | |||
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | /** | 1349 | /** |
1350 | * emac_poll: EMAC NAPI Poll function | 1350 | * emac_poll - EMAC NAPI Poll function |
1351 | * @ndev: The DaVinci EMAC network adapter | 1351 | * @ndev: The DaVinci EMAC network adapter |
1352 | * @budget: Number of receive packets to process (as told by NAPI layer) | 1352 | * @budget: Number of receive packets to process (as told by NAPI layer) |
1353 | * | 1353 | * |
@@ -1430,7 +1430,7 @@ static int emac_poll(struct napi_struct *napi, int budget) | |||
1430 | 1430 | ||
1431 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1431 | #ifdef CONFIG_NET_POLL_CONTROLLER |
1432 | /** | 1432 | /** |
1433 | * emac_poll_controller: EMAC Poll controller function | 1433 | * emac_poll_controller - EMAC Poll controller function |
1434 | * @ndev: The DaVinci EMAC network adapter | 1434 | * @ndev: The DaVinci EMAC network adapter |
1435 | * | 1435 | * |
1436 | * Polled functionality used by netconsole and others in non interrupt mode | 1436 | * Polled functionality used by netconsole and others in non interrupt mode |
@@ -1489,7 +1489,7 @@ static void emac_adjust_link(struct net_device *ndev) | |||
1489 | *************************************************************************/ | 1489 | *************************************************************************/ |
1490 | 1490 | ||
1491 | /** | 1491 | /** |
1492 | * emac_devioctl: EMAC adapter ioctl | 1492 | * emac_devioctl - EMAC adapter ioctl |
1493 | * @ndev: The DaVinci EMAC network adapter | 1493 | * @ndev: The DaVinci EMAC network adapter |
1494 | * @ifrq: request parameter | 1494 | * @ifrq: request parameter |
1495 | * @cmd: command parameter | 1495 | * @cmd: command parameter |
@@ -1516,7 +1516,7 @@ static int match_first_device(struct device *dev, void *data) | |||
1516 | } | 1516 | } |
1517 | 1517 | ||
1518 | /** | 1518 | /** |
1519 | * emac_dev_open: EMAC device open | 1519 | * emac_dev_open - EMAC device open |
1520 | * @ndev: The DaVinci EMAC network adapter | 1520 | * @ndev: The DaVinci EMAC network adapter |
1521 | * | 1521 | * |
1522 | * Called when system wants to start the interface. We init TX/RX channels | 1522 | * Called when system wants to start the interface. We init TX/RX channels |
@@ -1649,7 +1649,7 @@ rollback: | |||
1649 | } | 1649 | } |
1650 | 1650 | ||
1651 | /** | 1651 | /** |
1652 | * emac_dev_stop: EMAC device stop | 1652 | * emac_dev_stop - EMAC device stop |
1653 | * @ndev: The DaVinci EMAC network adapter | 1653 | * @ndev: The DaVinci EMAC network adapter |
1654 | * | 1654 | * |
1655 | * Called when system wants to stop or down the interface. We stop the network | 1655 | * Called when system wants to stop or down the interface. We stop the network |
@@ -1691,7 +1691,7 @@ static int emac_dev_stop(struct net_device *ndev) | |||
1691 | } | 1691 | } |
1692 | 1692 | ||
1693 | /** | 1693 | /** |
1694 | * emac_dev_getnetstats: EMAC get statistics function | 1694 | * emac_dev_getnetstats - EMAC get statistics function |
1695 | * @ndev: The DaVinci EMAC network adapter | 1695 | * @ndev: The DaVinci EMAC network adapter |
1696 | * | 1696 | * |
1697 | * Called when system wants to get statistics from the device. | 1697 | * Called when system wants to get statistics from the device. |
@@ -1763,7 +1763,7 @@ static const struct net_device_ops emac_netdev_ops = { | |||
1763 | }; | 1763 | }; |
1764 | 1764 | ||
1765 | /** | 1765 | /** |
1766 | * davinci_emac_probe: EMAC device probe | 1766 | * davinci_emac_probe - EMAC device probe |
1767 | * @pdev: The DaVinci EMAC device that we are removing | 1767 | * @pdev: The DaVinci EMAC device that we are removing |
1768 | * | 1768 | * |
1769 | * Called when probing for emac devicesr. We get details of instances and | 1769 | * Called when probing for emac devicesr. We get details of instances and |
@@ -1949,7 +1949,7 @@ free_clk: | |||
1949 | } | 1949 | } |
1950 | 1950 | ||
1951 | /** | 1951 | /** |
1952 | * davinci_emac_remove: EMAC device remove | 1952 | * davinci_emac_remove - EMAC device remove |
1953 | * @pdev: The DaVinci EMAC device that we are removing | 1953 | * @pdev: The DaVinci EMAC device that we are removing |
1954 | * | 1954 | * |
1955 | * Called when removing the device driver. We disable clock usage and release | 1955 | * Called when removing the device driver. We disable clock usage and release |
@@ -2029,7 +2029,7 @@ static struct platform_driver davinci_emac_driver = { | |||
2029 | }; | 2029 | }; |
2030 | 2030 | ||
2031 | /** | 2031 | /** |
2032 | * davinci_emac_init: EMAC driver module init | 2032 | * davinci_emac_init - EMAC driver module init |
2033 | * | 2033 | * |
2034 | * Called when initializing the driver. We register the driver with | 2034 | * Called when initializing the driver. We register the driver with |
2035 | * the platform. | 2035 | * the platform. |
@@ -2041,7 +2041,7 @@ static int __init davinci_emac_init(void) | |||
2041 | late_initcall(davinci_emac_init); | 2041 | late_initcall(davinci_emac_init); |
2042 | 2042 | ||
2043 | /** | 2043 | /** |
2044 | * davinci_emac_exit: EMAC driver module exit | 2044 | * davinci_emac_exit - EMAC driver module exit |
2045 | * | 2045 | * |
2046 | * Called when exiting the driver completely. We unregister the driver with | 2046 | * Called when exiting the driver completely. We unregister the driver with |
2047 | * the platform and exit | 2047 | * the platform and exit |
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index 6199f6b387b6..c1ebfe9efcb3 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c | |||
@@ -114,7 +114,8 @@ spider_net_write_reg(struct spider_net_card *card, u32 reg, u32 value) | |||
114 | out_be32(card->regs + reg, value); | 114 | out_be32(card->regs + reg, value); |
115 | } | 115 | } |
116 | 116 | ||
117 | /** spider_net_write_phy - write to phy register | 117 | /** |
118 | * spider_net_write_phy - write to phy register | ||
118 | * @netdev: adapter to be written to | 119 | * @netdev: adapter to be written to |
119 | * @mii_id: id of MII | 120 | * @mii_id: id of MII |
120 | * @reg: PHY register | 121 | * @reg: PHY register |
@@ -137,7 +138,8 @@ spider_net_write_phy(struct net_device *netdev, int mii_id, | |||
137 | spider_net_write_reg(card, SPIDER_NET_GPCWOPCMD, writevalue); | 138 | spider_net_write_reg(card, SPIDER_NET_GPCWOPCMD, writevalue); |
138 | } | 139 | } |
139 | 140 | ||
140 | /** spider_net_read_phy - read from phy register | 141 | /** |
142 | * spider_net_read_phy - read from phy register | ||
141 | * @netdev: network device to be read from | 143 | * @netdev: network device to be read from |
142 | * @mii_id: id of MII | 144 | * @mii_id: id of MII |
143 | * @reg: PHY register | 145 | * @reg: PHY register |
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 1eaf7128afee..1817d0e18fb2 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c | |||
@@ -197,7 +197,7 @@ static int temac_dcr_setup(struct temac_local *lp, struct platform_device *op, | |||
197 | #endif | 197 | #endif |
198 | 198 | ||
199 | /** | 199 | /** |
200 | * * temac_dma_bd_release - Release buffer descriptor rings | 200 | * temac_dma_bd_release - Release buffer descriptor rings |
201 | */ | 201 | */ |
202 | static void temac_dma_bd_release(struct net_device *ndev) | 202 | static void temac_dma_bd_release(struct net_device *ndev) |
203 | { | 203 | { |