1 files changed, 22 insertions, 30 deletions

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 6abc2ac8fffb..94639d6b5fb5 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -99,7 +99,7 @@
 #include <linux/firmware.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -1153,7 +1153,6 @@ static void riptide_handleirq(unsigned long dev_id)
 #ifdef CONFIG_PM_SLEEP
 static int riptide_suspend(struct device *dev)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
         struct snd_card *card = dev_get_drvdata(dev);
         struct snd_riptide *chip = card->private_data;
 
@@ -1161,27 +1160,14 @@ static int riptide_suspend(struct device *dev)
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         snd_pcm_suspend_all(chip->pcm);
         snd_ac97_suspend(chip->ac97);
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, PCI_D3hot);
         return 0;
 }
 
 static int riptide_resume(struct device *dev)
 {
-        struct pci_dev *pci = to_pci_dev(dev);
         struct snd_card *card = dev_get_drvdata(dev);
         struct snd_riptide *chip = card->private_data;
 
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "riptide: pci_enable_device failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
         snd_riptide_initialize(chip);
         snd_ac97_resume(chip->ac97);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -1706,14 +1692,11 @@ static struct snd_pcm_ops snd_riptide_capture_ops = {
         .pointer = snd_riptide_pointer,
 };
 
-static int
-snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm)
+static int snd_riptide_pcm(struct snd_riptide *chip, int device)
 {
         struct snd_pcm *pcm;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
         if ((err =
              snd_pcm_new(chip->card, "RIPTIDE", device, PLAYBACK_SUBSTREAMS, 1,
                          &pcm)) < 0)
@@ -1729,8 +1712,6 @@ snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm)
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
                                               snd_dma_pci_data(chip->pci),
                                               64 * 1024, 128 * 1024);
-        if (rpcm)
-                *rpcm = pcm;
         return 0;
 }
 
@@ -2030,32 +2011,43 @@ snd_riptide_joystick_probe(struct pci_dev *pci, const struct pci_device_id *id)
 {
         static int dev;
         struct gameport *gameport;
+        int ret;
 
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
+
         if (!enable[dev]) {
-                dev++;
-                return -ENOENT;
+                ret = -ENOENT;
+                goto inc_dev;
         }
 
-        if (!joystick_port[dev++])
-                return 0;
+        if (!joystick_port[dev]) {
+                ret = 0;
+                goto inc_dev;
+        }
 
         gameport = gameport_allocate_port();
-        if (!gameport)
-                return -ENOMEM;
+        if (!gameport) {
+                ret = -ENOMEM;
+                goto inc_dev;
+        }
         if (!request_region(joystick_port[dev], 8, "Riptide gameport")) {
                 snd_printk(KERN_WARNING
                            "Riptide: cannot grab gameport 0x%x\n",
                            joystick_port[dev]);
                 gameport_free_port(gameport);
-                return -EBUSY;
+                ret = -EBUSY;
+                goto inc_dev;
         }
 
         gameport->io = joystick_port[dev];
         gameport_register_port(gameport);
         pci_set_drvdata(pci, gameport);
-        return 0;
+
+        ret = 0;
+inc_dev:
+        dev++;
+        return ret;
 }
 
 static void snd_riptide_joystick_remove(struct pci_dev *pci)
@@ -2092,7 +2084,7 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
         if (err < 0)
                 goto error;
         card->private_data = chip;
-        err = snd_riptide_pcm(chip, 0, NULL);
+        err = snd_riptide_pcm(chip, 0);
         if (err < 0)
                 goto error;
         err = snd_riptide_mixer(chip);