From 1c612d99abc883948b0a193b36d3fdcd4ad72469 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 29 Jan 2007 16:38:07 -0800
Subject: [PATCH] --- yaml --- r: 45897 b: refs/heads/master c:
 4cbf2aa35e1c189db234190fefc6c83b139ef963 h: refs/heads/master i:   45895:
 eea13a748bb7d1f0211c95cf8e884a5061b0f5af v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/sky2.c | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 6587c2f68505..27959b7079fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc6e29da9162fa8fa2a9e798569c0f6e87975614
+refs/heads/master: 4cbf2aa35e1c189db234190fefc6c83b139ef963
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index a2e804ddca6c..822dd0b13133 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/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
 };