diff options
Diffstat (limited to 'drivers/staging/octeon/ethernet.c')
-rw-r--r-- | drivers/staging/octeon/ethernet.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 5ee60ab0b23..45cb4c7d422 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c | |||
@@ -176,9 +176,6 @@ static void cvm_oct_periodic_worker(struct work_struct *work) | |||
176 | queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ); | 176 | queue_delayed_work(cvm_oct_poll_queue, &priv->port_periodic_work, HZ); |
177 | } | 177 | } |
178 | 178 | ||
179 | /** | ||
180 | * Configure common hardware for all interfaces | ||
181 | */ | ||
182 | static __init void cvm_oct_configure_common_hw(void) | 179 | static __init void cvm_oct_configure_common_hw(void) |
183 | { | 180 | { |
184 | /* Setup the FPA */ | 181 | /* Setup the FPA */ |
@@ -198,10 +195,10 @@ static __init void cvm_oct_configure_common_hw(void) | |||
198 | } | 195 | } |
199 | 196 | ||
200 | /** | 197 | /** |
201 | * Free a work queue entry received in a intercept callback. | 198 | * cvm_oct_free_work- Free a work queue entry |
199 | * | ||
200 | * @work_queue_entry: Work queue entry to free | ||
202 | * | 201 | * |
203 | * @work_queue_entry: | ||
204 | * Work queue entry to free | ||
205 | * Returns Zero on success, Negative on failure. | 202 | * Returns Zero on success, Negative on failure. |
206 | */ | 203 | */ |
207 | int cvm_oct_free_work(void *work_queue_entry) | 204 | int cvm_oct_free_work(void *work_queue_entry) |
@@ -228,9 +225,9 @@ int cvm_oct_free_work(void *work_queue_entry) | |||
228 | EXPORT_SYMBOL(cvm_oct_free_work); | 225 | EXPORT_SYMBOL(cvm_oct_free_work); |
229 | 226 | ||
230 | /** | 227 | /** |
231 | * Get the low level ethernet statistics | 228 | * cvm_oct_common_get_stats - get the low level ethernet statistics |
232 | * | ||
233 | * @dev: Device to get the statistics from | 229 | * @dev: Device to get the statistics from |
230 | * | ||
234 | * Returns Pointer to the statistics | 231 | * Returns Pointer to the statistics |
235 | */ | 232 | */ |
236 | static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev) | 233 | static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev) |
@@ -274,8 +271,7 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev) | |||
274 | } | 271 | } |
275 | 272 | ||
276 | /** | 273 | /** |
277 | * Change the link MTU. Unimplemented | 274 | * cvm_oct_common_change_mtu - change the link MTU |
278 | * | ||
279 | * @dev: Device to change | 275 | * @dev: Device to change |
280 | * @new_mtu: The new MTU | 276 | * @new_mtu: The new MTU |
281 | * | 277 | * |
@@ -339,8 +335,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu) | |||
339 | } | 335 | } |
340 | 336 | ||
341 | /** | 337 | /** |
342 | * Set the multicast list. Currently unimplemented. | 338 | * cvm_oct_common_set_multicast_list - set the multicast list |
343 | * | ||
344 | * @dev: Device to work on | 339 | * @dev: Device to work on |
345 | */ | 340 | */ |
346 | static void cvm_oct_common_set_multicast_list(struct net_device *dev) | 341 | static void cvm_oct_common_set_multicast_list(struct net_device *dev) |
@@ -395,10 +390,10 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev) | |||
395 | } | 390 | } |
396 | 391 | ||
397 | /** | 392 | /** |
398 | * Set the hardware MAC address for a device | 393 | * cvm_oct_common_set_mac_address - set the hardware MAC address for a device |
399 | * | 394 | * @dev: The device in question. |
400 | * @dev: Device to change the MAC address for | 395 | * @addr: Address structure to change it too. |
401 | * @addr: Address structure to change it too. MAC address is addr + 2. | 396 | |
402 | * Returns Zero on success | 397 | * Returns Zero on success |
403 | */ | 398 | */ |
404 | static int cvm_oct_common_set_mac_address(struct net_device *dev, void *addr) | 399 | static int cvm_oct_common_set_mac_address(struct net_device *dev, void *addr) |
@@ -445,9 +440,9 @@ static int cvm_oct_common_set_mac_address(struct net_device *dev, void *addr) | |||
445 | } | 440 | } |
446 | 441 | ||
447 | /** | 442 | /** |
448 | * Per network device initialization | 443 | * cvm_oct_common_init - per network device initialization |
449 | * | ||
450 | * @dev: Device to initialize | 444 | * @dev: Device to initialize |
445 | * | ||
451 | * Returns Zero on success | 446 | * Returns Zero on success |
452 | */ | 447 | */ |
453 | int cvm_oct_common_init(struct net_device *dev) | 448 | int cvm_oct_common_init(struct net_device *dev) |
@@ -603,12 +598,6 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = { | |||
603 | 598 | ||
604 | extern void octeon_mdiobus_force_mod_depencency(void); | 599 | extern void octeon_mdiobus_force_mod_depencency(void); |
605 | 600 | ||
606 | /** | ||
607 | * Module/ driver initialization. Creates the linux network | ||
608 | * devices. | ||
609 | * | ||
610 | * Returns Zero on success | ||
611 | */ | ||
612 | static int __init cvm_oct_init_module(void) | 601 | static int __init cvm_oct_init_module(void) |
613 | { | 602 | { |
614 | int num_interfaces; | 603 | int num_interfaces; |
@@ -802,11 +791,6 @@ static int __init cvm_oct_init_module(void) | |||
802 | return 0; | 791 | return 0; |
803 | } | 792 | } |
804 | 793 | ||
805 | /** | ||
806 | * Module / driver shutdown | ||
807 | * | ||
808 | * Returns Zero on success | ||
809 | */ | ||
810 | static void __exit cvm_oct_cleanup_module(void) | 794 | static void __exit cvm_oct_cleanup_module(void) |
811 | { | 795 | { |
812 | int port; | 796 | int port; |