aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2009-09-25 08:20:33 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-26 23:16:01 -0400
commit11b7f7b37809f594951b7f98094c85f433f86d1a (patch)
tree02e018e0b2264454c3a010af3392276a0f77e0cd /drivers/net/e1000
parent8f601b2d565fdf24e34d90c617cd4b777faad68f (diff)
e1000: fix namespacecheck warnings
a couple of functions needed to be removed/declared static Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_hw.c2
-rw-r--r--drivers/net/e1000/e1000_main.c14
2 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 50114cd2df96..8d7d87f12827 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -2190,7 +2190,7 @@ static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)
2190 * Checks for link up on the hardware. If link is not up and we have 2190 * Checks for link up on the hardware. If link is not up and we have
2191 * a signal, then we need to force link up. 2191 * a signal, then we need to force link up.
2192 */ 2192 */
2193s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw) 2193static s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw)
2194{ 2194{
2195 u32 rxcw; 2195 u32 rxcw;
2196 u32 ctrl; 2196 u32 ctrl;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8302e1881b83..bcd192ca47b0 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4349,20 +4349,6 @@ void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
4349 pcix_set_mmrbc(adapter->pdev, mmrbc); 4349 pcix_set_mmrbc(adapter->pdev, mmrbc);
4350} 4350}
4351 4351
4352s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
4353{
4354 struct e1000_adapter *adapter = hw->back;
4355 u16 cap_offset;
4356
4357 cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
4358 if (!cap_offset)
4359 return -E1000_ERR_CONFIG;
4360
4361 pci_read_config_word(adapter->pdev, cap_offset + reg, value);
4362
4363 return E1000_SUCCESS;
4364}
4365
4366void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value) 4352void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value)
4367{ 4353{
4368 outl(value, port); 4354 outl(value, port);