[PATCH] myri10ge - drop workaround pci_save_state() disabling MSI

We don't need to restore the state right after saving it for later recovery
since commit c7f01d82e85d26f781d63ffe0783997c2c78a3b1 (PCI: disable msi mode
in pci_disable_device) now prevents pci_save_state() from disabling MSI.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 5058def3b6255dff06edae933b0899fc55d03b97..5a74f63618bccd8e533b76b7cba3adffb0edd379 100644 (file)
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2726,8 +2726,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Save configuration space to be restored if the
         * nic resets due to a parity error */
        myri10ge_save_state(mgp);
-       /* Restore state immediately since pci_save_msi_state disables MSI */
-       myri10ge_restore_state(mgp);
 
        /* Setup the watchdog timer */
        setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,