diff options
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a2e804ddca6c..822dd0b13133 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -3639,29 +3639,6 @@ static int sky2_resume(struct pci_dev *pdev) | |||
| 3639 | out: | 3639 | out: |
| 3640 | return err; | 3640 | return err; |
| 3641 | } | 3641 | } |
| 3642 | |||
| 3643 | /* BIOS resume runs after device (it's a bug in PM) | ||
| 3644 | * as a temporary workaround on suspend/resume leave MSI disabled | ||
| 3645 | */ | ||
| 3646 | static int sky2_suspend_late(struct pci_dev *pdev, pm_message_t state) | ||
| 3647 | { | ||
| 3648 | struct sky2_hw *hw = pci_get_drvdata(pdev); | ||
| 3649 | |||
| 3650 | free_irq(pdev->irq, hw); | ||
| 3651 | if (hw->msi) { | ||
| 3652 | pci_disable_msi(pdev); | ||
| 3653 | hw->msi = 0; | ||
| 3654 | } | ||
| 3655 | return 0; | ||
| 3656 | } | ||
| 3657 | |||
| 3658 | static int sky2_resume_early(struct pci_dev *pdev) | ||
| 3659 | { | ||
| 3660 | struct sky2_hw *hw = pci_get_drvdata(pdev); | ||
| 3661 | struct net_device *dev = hw->dev[0]; | ||
| 3662 | |||
| 3663 | return request_irq(pdev->irq, sky2_intr, IRQF_SHARED, dev->name, hw); | ||
| 3664 | } | ||
| 3665 | #endif | 3642 | #endif |
| 3666 | 3643 | ||
| 3667 | static struct pci_driver sky2_driver = { | 3644 | static struct pci_driver sky2_driver = { |
| @@ -3672,8 +3649,6 @@ static struct pci_driver sky2_driver = { | |||
| 3672 | #ifdef CONFIG_PM | 3649 | #ifdef CONFIG_PM |
| 3673 | .suspend = sky2_suspend, | 3650 | .suspend = sky2_suspend, |
| 3674 | .resume = sky2_resume, | 3651 | .resume = sky2_resume, |
| 3675 | .suspend_late = sky2_suspend_late, | ||
| 3676 | .resume_early = sky2_resume_early, | ||
| 3677 | #endif | 3652 | #endif |
| 3678 | }; | 3653 | }; |
| 3679 | 3654 | ||
