summaryrefslogtreecommitdiffstats
path: root/sys/dev/e1000/e1000_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/e1000/e1000_api.c')
-rw-r--r--sys/dev/e1000/e1000_api.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c
index aaa70b1..47bffb5 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -72,7 +72,6 @@ s32 e1000_init_nvm_params(struct e1000_hw *hw)
s32 ret_val = E1000_SUCCESS;
if (hw->nvm.ops.init_params) {
- hw->nvm.semaphore_delay = 10;
ret_val = hw->nvm.ops.init_params(hw);
if (ret_val) {
DEBUGOUT("NVM Initialization Error\n");
@@ -379,19 +378,6 @@ out:
}
/**
- * e1000_remove_device - Free device specific structure
- * @hw: pointer to the HW structure
- *
- * If a device specific structure was allocated, this function will
- * free it. This is a function pointer entry point called by drivers.
- **/
-void e1000_remove_device(struct e1000_hw *hw)
-{
- if (hw->mac.ops.remove_device)
- hw->mac.ops.remove_device(hw);
-}
-
-/**
* e1000_get_bus_info - Obtain bus information for adapter
* @hw: pointer to the HW structure
*
@@ -929,6 +915,18 @@ s32 e1000_acquire_phy(struct e1000_hw *hw)
}
/**
+ * e1000_cfg_on_link_up - Configure PHY upon link up
+ * @hw: pointer to the HW structure
+ **/
+s32 e1000_cfg_on_link_up(struct e1000_hw *hw)
+{
+ if (hw->phy.ops.cfg_on_link_up)
+ return hw->phy.ops.cfg_on_link_up(hw);
+
+ return E1000_SUCCESS;
+}
+
+/**
* e1000_read_kmrn_reg - Reads register using Kumeran interface
* @hw: pointer to the HW structure
* @offset: the register to read
OpenPOWER on IntegriCloud