diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-11-23 21:23:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:02 -0500 |
commit | 4790654c71b250018ecc234f6b9f1ed96a55572d (patch) | |
tree | 0902dbbcc763aa51c6209b560bff97505c0849eb /drivers/net/netxen/netxen_nic_ethtool.c | |
parent | ba734f349d5ba02a736e2d574584c56cd21bad14 (diff) |
[netdrvr] netxen: checkpatch fixes (98% trim trailing whitespace)
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_ethtool.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index cdec4f87e1ed..7a876f4b8db2 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
@@ -423,11 +423,11 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
423 | if (eeprom->len == 0) | 423 | if (eeprom->len == 0) |
424 | return -EINVAL; | 424 | return -EINVAL; |
425 | 425 | ||
426 | eeprom->magic = (adapter->pdev)->vendor | | 426 | eeprom->magic = (adapter->pdev)->vendor | |
427 | ((adapter->pdev)->device << 16); | 427 | ((adapter->pdev)->device << 16); |
428 | offset = eeprom->offset; | 428 | offset = eeprom->offset; |
429 | 429 | ||
430 | ret = netxen_rom_fast_read_words(adapter, offset, bytes, | 430 | ret = netxen_rom_fast_read_words(adapter, offset, bytes, |
431 | eeprom->len); | 431 | eeprom->len); |
432 | if (ret < 0) | 432 | if (ret < 0) |
433 | return ret; | 433 | return ret; |
@@ -453,16 +453,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
453 | netxen_nic_driver_name); | 453 | netxen_nic_driver_name); |
454 | return ret; | 454 | return ret; |
455 | } | 455 | } |
456 | printk(KERN_INFO "%s: flash unlocked. \n", | 456 | printk(KERN_INFO "%s: flash unlocked. \n", |
457 | netxen_nic_driver_name); | 457 | netxen_nic_driver_name); |
458 | last_schedule_time = jiffies; | 458 | last_schedule_time = jiffies; |
459 | ret = netxen_flash_erase_secondary(adapter); | 459 | ret = netxen_flash_erase_secondary(adapter); |
460 | if (ret != FLASH_SUCCESS) { | 460 | if (ret != FLASH_SUCCESS) { |
461 | printk(KERN_ERR "%s: Flash erase failed.\n", | 461 | printk(KERN_ERR "%s: Flash erase failed.\n", |
462 | netxen_nic_driver_name); | 462 | netxen_nic_driver_name); |
463 | return ret; | 463 | return ret; |
464 | } | 464 | } |
465 | printk(KERN_INFO "%s: secondary flash erased successfully.\n", | 465 | printk(KERN_INFO "%s: secondary flash erased successfully.\n", |
466 | netxen_nic_driver_name); | 466 | netxen_nic_driver_name); |
467 | flash_start = 1; | 467 | flash_start = 1; |
468 | return 0; | 468 | return 0; |
@@ -471,7 +471,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
471 | if (offset == NETXEN_BOOTLD_START) { | 471 | if (offset == NETXEN_BOOTLD_START) { |
472 | ret = netxen_flash_erase_primary(adapter); | 472 | ret = netxen_flash_erase_primary(adapter); |
473 | if (ret != FLASH_SUCCESS) { | 473 | if (ret != FLASH_SUCCESS) { |
474 | printk(KERN_ERR "%s: Flash erase failed.\n", | 474 | printk(KERN_ERR "%s: Flash erase failed.\n", |
475 | netxen_nic_driver_name); | 475 | netxen_nic_driver_name); |
476 | return ret; | 476 | return ret; |
477 | } | 477 | } |
@@ -483,16 +483,16 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
483 | if (ret != FLASH_SUCCESS) | 483 | if (ret != FLASH_SUCCESS) |
484 | return ret; | 484 | return ret; |
485 | 485 | ||
486 | printk(KERN_INFO "%s: primary flash erased successfully\n", | 486 | printk(KERN_INFO "%s: primary flash erased successfully\n", |
487 | netxen_nic_driver_name); | 487 | netxen_nic_driver_name); |
488 | 488 | ||
489 | ret = netxen_backup_crbinit(adapter); | 489 | ret = netxen_backup_crbinit(adapter); |
490 | if (ret != FLASH_SUCCESS) { | 490 | if (ret != FLASH_SUCCESS) { |
491 | printk(KERN_ERR "%s: CRBinit backup failed.\n", | 491 | printk(KERN_ERR "%s: CRBinit backup failed.\n", |
492 | netxen_nic_driver_name); | 492 | netxen_nic_driver_name); |
493 | return ret; | 493 | return ret; |
494 | } | 494 | } |
495 | printk(KERN_INFO "%s: CRBinit backup done.\n", | 495 | printk(KERN_INFO "%s: CRBinit backup done.\n", |
496 | netxen_nic_driver_name); | 496 | netxen_nic_driver_name); |
497 | ready_to_flash = 1; | 497 | ready_to_flash = 1; |
498 | } | 498 | } |
@@ -570,7 +570,7 @@ netxen_nic_get_pauseparam(struct net_device *dev, | |||
570 | else | 570 | else |
571 | pause->tx_pause = !(netxen_xg_get_xg1_mask(val)); | 571 | pause->tx_pause = !(netxen_xg_get_xg1_mask(val)); |
572 | } else { | 572 | } else { |
573 | printk(KERN_ERR"%s: Unknown board type: %x\n", | 573 | printk(KERN_ERR"%s: Unknown board type: %x\n", |
574 | netxen_nic_driver_name, adapter->ahw.board_type); | 574 | netxen_nic_driver_name, adapter->ahw.board_type); |
575 | } | 575 | } |
576 | } | 576 | } |
@@ -589,7 +589,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, | |||
589 | /* set flow control */ | 589 | /* set flow control */ |
590 | netxen_nic_read_w0(adapter, | 590 | netxen_nic_read_w0(adapter, |
591 | NETXEN_NIU_GB_MAC_CONFIG_0(port), &val); | 591 | NETXEN_NIU_GB_MAC_CONFIG_0(port), &val); |
592 | 592 | ||
593 | if (pause->rx_pause) | 593 | if (pause->rx_pause) |
594 | netxen_gb_rx_flowctl(val); | 594 | netxen_gb_rx_flowctl(val); |
595 | else | 595 | else |
@@ -642,10 +642,10 @@ netxen_nic_set_pauseparam(struct net_device *dev, | |||
642 | else | 642 | else |
643 | netxen_xg_set_xg1_mask(val); | 643 | netxen_xg_set_xg1_mask(val); |
644 | } | 644 | } |
645 | netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val); | 645 | netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val); |
646 | } else { | 646 | } else { |
647 | printk(KERN_ERR "%s: Unknown board type: %x\n", | 647 | printk(KERN_ERR "%s: Unknown board type: %x\n", |
648 | netxen_nic_driver_name, | 648 | netxen_nic_driver_name, |
649 | adapter->ahw.board_type); | 649 | adapter->ahw.board_type); |
650 | } | 650 | } |
651 | return 0; | 651 | return 0; |