diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-30 15:14:40 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-30 15:14:40 +0100 |
| commit | 64c9d27d6a692d2c27df14ef44cb400b4aa412b3 (patch) | |
| tree | eac635d0a418f9a337048e66b3346cb2e08b5d85 /drivers | |
| parent | libata: fix ata_eh_suspend() return value (diff) | |
| parent | [PATCH] Fix SG_IO timeout jiffy conversion (diff) | |
| download | linux-64c9d27d6a692d2c27df14ef44cb400b4aa412b3.tar.xz linux-64c9d27d6a692d2c27df14ef44cb400b4aa412b3.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers')
| -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) out: return err; } - -/* BIOS resume runs after device (it's a bug in PM) - * as a temporary workaround on suspend/resume leave MSI disabled - */ -static int sky2_suspend_late(struct pci_dev *pdev, pm_message_t state) -{ - struct sky2_hw *hw = pci_get_drvdata(pdev); - - free_irq(pdev->irq, hw); - if (hw->msi) { - pci_disable_msi(pdev); - hw->msi = 0; - } - return 0; -} - -static int sky2_resume_early(struct pci_dev *pdev) -{ - struct sky2_hw *hw = pci_get_drvdata(pdev); - struct net_device *dev = hw->dev[0]; - - return request_irq(pdev->irq, sky2_intr, IRQF_SHARED, dev->name, hw); -} #endif static struct pci_driver sky2_driver = { @@ -3672,8 +3649,6 @@ static struct pci_driver sky2_driver = { #ifdef CONFIG_PM .suspend = sky2_suspend, .resume = sky2_resume, - .suspend_late = sky2_suspend_late, - .resume_early = sky2_resume_early, #endif }; |