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_main.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_main.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 97006e16f6de..97ba14b759b4 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -350,7 +350,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
350 | first_page_group_start = 0; | 350 | first_page_group_start = 0; |
351 | first_page_group_end = 0; | 351 | first_page_group_end = 0; |
352 | } else { | 352 | } else { |
353 | err = -EIO; | 353 | err = -EIO; |
354 | goto err_out_free_netdev; | 354 | goto err_out_free_netdev; |
355 | } | 355 | } |
356 | 356 | ||
@@ -410,7 +410,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
410 | netdev->open = netxen_nic_open; | 410 | netdev->open = netxen_nic_open; |
411 | netdev->stop = netxen_nic_close; | 411 | netdev->stop = netxen_nic_close; |
412 | netdev->hard_start_xmit = netxen_nic_xmit_frame; | 412 | netdev->hard_start_xmit = netxen_nic_xmit_frame; |
413 | netdev->get_stats = netxen_nic_get_stats; | 413 | netdev->get_stats = netxen_nic_get_stats; |
414 | netdev->set_multicast_list = netxen_nic_set_multi; | 414 | netdev->set_multicast_list = netxen_nic_set_multi; |
415 | netdev->set_mac_address = netxen_nic_set_mac; | 415 | netdev->set_mac_address = netxen_nic_set_mac; |
416 | netdev->change_mtu = netxen_nic_change_mtu; | 416 | netdev->change_mtu = netxen_nic_change_mtu; |
@@ -457,8 +457,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
457 | 457 | ||
458 | adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS_HOST; | 458 | adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS_HOST; |
459 | if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB35_4G) || | 459 | if ((adapter->ahw.boardcfg.board_type == NETXEN_BRDTYPE_P2_SB35_4G) || |
460 | (adapter->ahw.boardcfg.board_type == | 460 | (adapter->ahw.boardcfg.board_type == |
461 | NETXEN_BRDTYPE_P2_SB31_2G)) | 461 | NETXEN_BRDTYPE_P2_SB31_2G)) |
462 | adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS_1G; | 462 | adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS_1G; |
463 | else | 463 | else |
464 | adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS; | 464 | adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS; |
@@ -583,9 +583,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
583 | 583 | ||
584 | if (adapter->portnum == 0) { | 584 | if (adapter->portnum == 0) { |
585 | err = netxen_initialize_adapter_offload(adapter); | 585 | err = netxen_initialize_adapter_offload(adapter); |
586 | if (err) | 586 | if (err) |
587 | goto err_out_free_rx_buffer; | 587 | goto err_out_free_rx_buffer; |
588 | val = readl(NETXEN_CRB_NORMALIZE(adapter, | 588 | val = readl(NETXEN_CRB_NORMALIZE(adapter, |
589 | NETXEN_CAM_RAM(0x1fc))); | 589 | NETXEN_CAM_RAM(0x1fc))); |
590 | if (val == 0x55555555) { | 590 | if (val == 0x55555555) { |
591 | /* This is the first boot after power up */ | 591 | /* This is the first boot after power up */ |
@@ -619,7 +619,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
619 | /* | 619 | /* |
620 | * Tell the hardware our version number. | 620 | * Tell the hardware our version number. |
621 | */ | 621 | */ |
622 | i = (_NETXEN_NIC_LINUX_MAJOR << 16) | 622 | i = (_NETXEN_NIC_LINUX_MAJOR << 16) |
623 | | ((_NETXEN_NIC_LINUX_MINOR << 8)) | 623 | | ((_NETXEN_NIC_LINUX_MINOR << 8)) |
624 | | (_NETXEN_NIC_LINUX_SUBVERSION); | 624 | | (_NETXEN_NIC_LINUX_SUBVERSION); |
625 | writel(i, NETXEN_CRB_NORMALIZE(adapter, CRB_DRIVER_VERSION)); | 625 | writel(i, NETXEN_CRB_NORMALIZE(adapter, CRB_DRIVER_VERSION)); |
@@ -659,7 +659,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
659 | break; | 659 | break; |
660 | 660 | ||
661 | case NETXEN_NIC_XGBE: | 661 | case NETXEN_NIC_XGBE: |
662 | printk(KERN_INFO "%s: XGbE board initialized\n", | 662 | printk(KERN_INFO "%s: XGbE board initialized\n", |
663 | netxen_nic_driver_name); | 663 | netxen_nic_driver_name); |
664 | break; | 664 | break; |
665 | } | 665 | } |
@@ -930,7 +930,7 @@ static int netxen_nic_close(struct net_device *netdev) | |||
930 | buffrag++; | 930 | buffrag++; |
931 | if (buffrag->dma) { | 931 | if (buffrag->dma) { |
932 | pci_unmap_page(adapter->pdev, buffrag->dma, | 932 | pci_unmap_page(adapter->pdev, buffrag->dma, |
933 | buffrag->length, | 933 | buffrag->length, |
934 | PCI_DMA_TODEVICE); | 934 | PCI_DMA_TODEVICE); |
935 | buffrag->dma = 0ULL; | 935 | buffrag->dma = 0ULL; |
936 | } | 936 | } |
@@ -1194,7 +1194,7 @@ static void netxen_tx_timeout(struct net_device *netdev) | |||
1194 | 1194 | ||
1195 | static void netxen_tx_timeout_task(struct work_struct *work) | 1195 | static void netxen_tx_timeout_task(struct work_struct *work) |
1196 | { | 1196 | { |
1197 | struct netxen_adapter *adapter = | 1197 | struct netxen_adapter *adapter = |
1198 | container_of(work, struct netxen_adapter, tx_timeout_task); | 1198 | container_of(work, struct netxen_adapter, tx_timeout_task); |
1199 | 1199 | ||
1200 | printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", | 1200 | printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", |