Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cbf2aa3 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds
Browse files

[PATCH] sky2: revert IRQ dance on suspend/resume 



Let's just backout the IRQ hack, and for those crap machines (like some
Sony VAIO's) can just disable MSI with the module parameter.

This reverts 44ade178.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Frédéric Riss <frederic.riss@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc6e29da

drivers/net/sky2.c

+0 −25
Original line number Diff line number Diff line
@@ -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

};