aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/oki-semi
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-07-10 06:56:00 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-11 02:13:46 -0400
commit49ce9c2cda18f62b13055dc715e7b514157c2da8 (patch)
tree432dea5cfd5c5f4b95a71a1e958e13b5cc538a1f /drivers/net/ethernet/oki-semi
parentae86b9e3846f6fc5509dee721f2bdba1db8ab96a (diff)
drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions
Fix incorrect start markers, wrapped summary lines, missing section breaks, incorrect separators, and some name mismatches. Delete a few that are content-free. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/oki-semi')
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c12
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c10
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c42
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c4
4 files changed, 34 insertions, 34 deletions
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 */
307s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw) 307s32 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 */
2103static int pch_gbe_stop(struct net_device *netdev) 2103static 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 */
2315static int pch_gbe_set_features(struct net_device *netdev, 2315static 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 */