Merge branch 'topic/pci-cleanup' into for-next

1 files changed, 0 insertions, 15 deletions

diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index c321a97b4344..349dd7ba6e43 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1120,7 +1120,6 @@ static int snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)
  */
 static int snd_atiixp_suspend(struct device *dev)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
         struct snd_card *card = dev_get_drvdata(dev);
         struct atiixp_modem *chip = card->private_data;
         int i;
@@ -1132,29 +1131,15 @@ static int snd_atiixp_suspend(struct device *dev)
                 snd_ac97_suspend(chip->ac97[i]);
         snd_atiixp_aclink_down(chip);
         snd_atiixp_chip_stop(chip);
-
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, PCI_D3hot);
         return 0;
 }
 
 static int snd_atiixp_resume(struct device *dev)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
         struct snd_card *card = dev_get_drvdata(dev);
         struct atiixp_modem *chip = card->private_data;
         int i;
 
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                dev_err(dev, "pci_enable_device failed, disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
-
         snd_atiixp_aclink_reset(chip);
         snd_atiixp_chip_start(chip);