aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/s2io.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5c0f80830939..9fd465b9f853 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3382,23 +3382,8 @@ static void s2io_reset(struct s2io_nic * sp)
3382 /* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */ 3382 /* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */
3383 pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd)); 3383 pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
3384 3384
3385 if (sp->device_type == XFRAME_II_DEVICE) {
3386 int ret;
3387 ret = pci_set_power_state(sp->pdev, 3);
3388 if (!ret)
3389 ret = pci_set_power_state(sp->pdev, 0);
3390 else {
3391 DBG_PRINT(ERR_DBG,"%s PME based SW_Reset failed!\n",
3392 __FUNCTION__);
3393 goto old_way;
3394 }
3395 msleep(20);
3396 goto new_way;
3397 }
3398old_way:
3399 val64 = SW_RESET_ALL; 3385 val64 = SW_RESET_ALL;
3400 writeq(val64, &bar0->sw_reset); 3386 writeq(val64, &bar0->sw_reset);
3401new_way:
3402 if (strstr(sp->product_name, "CX4")) { 3387 if (strstr(sp->product_name, "CX4")) {
3403 msleep(750); 3388 msleep(750);
3404 } 3389 }