e1000e: make a function static
Subsystems (2)
PATCH 1/6 e1000e: make a function static
From: Adrian Bunk <[email protected]>
This patch makes the needlessly global reg_pattern_test_array() static.
---
drivers/net/e1000e/ethtool.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000e/ethtool.c +2 -2
@@ -690,8 +690,8 @@ err_setup:return err; } -bool reg_pattern_test_array (struct e1000_adapter *adapter,u64 *data, -int reg,int offset,u32 mask,u32 write) +static bool reg_pattern_test_array (struct e1000_adapter *adapter,u64 *data, +int reg,int offset,u32 mask,u32 write) {int i;u32 read;
PATCH 2/6 e1000: make e1000_dump_eeprom() static
From: Adrian Bunk <[email protected]>
This patch makes the needlessly global e1000_dump_eeprom() static.
---
drivers/net/e1000/e1000_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/e1000/e1000_main.c +1 -1
@@ -853,7 +853,7 @@ e1000_reset(struct e1000_adapter *adapter)/** * Dump the eeprom for users having checksum issues **/ -void e1000_dump_eeprom (struct e1000_adapter *adapter) +static void e1000_dump_eeprom (struct e1000_adapter *adapter) {struct net_device *netdev = adapter->netdev;struct ethtool_eeprom eeprom;
PATCH 3/6 e100: Fix iomap mem accesses
In reply to Auke KokFrom: Jiri Slaby <[email protected]>
writeX functions are not permitted on iomap-ped space change to iowriteX, also pci_unmap pci_map-ped space on exit (instead of iounmap).
---
drivers/net/e100.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e100.c +2 -2
@@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,if (restart_required) {// ack the rnr? -writeb (stat_ack_rnr, &nic->csr->scb.stat_ack); +iowrite8 (stat_ack_rnr, &nic->csr->scb.stat_ack);e100_start_receiver (nic, nic->rx_to_clean);if (work_done) (*work_done)++;
@@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)struct nic *nic =netdev_priv (netdev);unregister_netdev (netdev);e100_free (nic); -iounmap (nic->csr); +pci_iounmap (pdev, nic->csr);free_netdev (netdev);pci_release_regions (pdev);pci_disable_device (pdev);
PATCH 4/6 e100: fix spelling errors
In reply to Auke KokFrom: Andreas Mohr <[email protected]>
---
drivers/net/e100.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/e100.c +7 -7
@@ -94,7 +94,7 @@* enabled. 82557 pads with 7Eh, while the later controllers pad * with 00h. * -* IV. Recieve +* IV. Receive * * The Receive Frame Area (RFA) comprises a ring of Receive Frame * Descriptors (RFD) + data buffer, thus forming the simplified mode
@@ -120,7 +120,7 @@* and Rx indication and re-allocation happen in the same context, * therefore no locking is required. A software-generated interrupt * is generated from the watchdog to recover from a failed allocation -* senario where all Rx resources have been indicated and none re- +* scenario where all Rx resources have been indicated and none re- * placed. * * V. Miscellaneous
@@ -954,7 +954,7 @@ static void e100_get_defaults(struct nic *nic)/* Quadwords to DMA into FIFO before starting frame transmit */ nic->tx_threshold =0xE0 ; -/* no interrupt for every tx completion, delay = 256us if not 557*/ +/* no interrupt for every tx completion, delay = 256us if not 557 */ nic->tx_command =cpu_to_le16 (cb_tx | cb_tx_sf | ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
@@ -1497,7 +1497,7 @@ static void e100_update_stats(struct nic *nic) &s->complete;/* Device's stats reporting may take several microseconds to -* complete, so where always waiting for results of the +* complete, so we're always waiting for results of the * previous command. */ if (*complete ==cpu_to_le32 (cuc_dump_reset_complete)) {
@@ -2858,17 +2858,17 @@ static void e100_shutdown(struct pci_dev *pdev)/** * e100_io_error_detected - called when PCI error is detected. * @pdev: Pointer to PCI device -* @state: The current pci conneection state +* @state: The current pci connection state */ static pci_ers_result_t e100_io_error_detected (struct pci_dev *pdev,pci_channel_state_t state) {struct net_device *netdev =pci_get_drvdata (pdev);struct nic *nic =netdev_priv (netdev); -/* Similar to calling e100_down(), but avoids adpater I/O. */ +/* Similar to calling e100_down(), but avoids adapter I/O. */ netdev->stop (netdev); -/* Detach; put netif into state similar to hotplug unplug. */ +/* Detach; put netif into a state similar to hotplug unplug. */ napi_enable (&nic->napi);netif_device_detach (netdev);pci_disable_device (pdev);
PATCH 5/6 e1000e: tweak irq allocation messages
In reply to Auke KokFrom: Andy Gospodarek <[email protected]>
There's too much noise on systems that don't support MSI. Let's get rid of a few and make the real error message more specific.
---
drivers/net/e1000e/netdev.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
drivers/net/e1000e/netdev.c +5 -7
@@ -945,11 +945,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)int irq_flags =IRQF_SHARED ;int err; - err =pci_enable_msi (adapter->pdev); -if (err) { -ndev_warn (netdev, -"Unable to allocate MSI interrupt Error: %d\n" , err); - }else { +if (!pci_enable_msi (adapter->pdev)) { adapter->flags |=FLAG_MSI_ENABLED ; handler = e1000_intr_msi; irq_flags =0 ;
@@ -958,10 +954,12 @@ static int e1000_request_irq(struct e1000_adapter *adapter) err =request_irq (adapter->pdev->irq, handler, irq_flags, netdev->name, netdev);if (err) { +ndev_err (netdev, +"Unable to allocate %s interrupt (return: %d)\n" , + adapter->flags &FLAG_MSI_ENABLED ?"MSI" :"INTx" , + err);if (adapter->flags &FLAG_MSI_ENABLED )pci_disable_msi (adapter->pdev); -ndev_err (netdev, -"Unable to allocate interrupt Error: %d\n" , err); }return err;
PATCH 6/6 igb: remove unneeded declaration shadowing earlier one
In reply to Auke KokThis removes a sparse warning.
---
drivers/net/igb/igb_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/igb/igb_main.c +0 -1
@@ -438,7 +438,6 @@ static int igb_request_irq(struct igb_adapter *adapter)if (adapter->msix_entries) { err =igb_request_msix (adapter);if (!err) { -struct e1000_hw *hw = &adapter->hw;/* enable IAM, auto-mask, * DO NOT USE EIAME or IAME in legacy mode */ wr32 (E1000_IAM ,IMS_ENABLE_MASK );
applied 1-6