5 files changed, 17 insertions, 61 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 4c171636efcd..a3c00a668268 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -132,11 +132,11 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,
                 goto error;
         card->private_data = emu;
         emu->delay_pcm_irq = delay_pcm_irq[dev] & 0x1f;
-        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm(emu, 0)) < 0)
                 goto error;
-        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm_mic(emu, 1)) < 0)
                 goto error;
-        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm_efx(emu, 2)) < 0)
                 goto error;
         /* This stores the periods table. */
         if (emu->card_capabilities->ca0151_chip) { /* P16V */   
@@ -151,10 +151,10 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,
         if ((err = snd_emu10k1_timer(emu, 0)) < 0)
                 goto error;
 
-        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm_multi(emu, 3)) < 0)
                 goto error;
         if (emu->card_capabilities->ca0151_chip) { /* P16V */
-                if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0)
+                if ((err = snd_p16v_pcm(emu, 4)) < 0)
                         goto error;
         }
         if (emu->audigy) {
@@ -164,7 +164,7 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci,
                 if ((err = snd_emu10k1_midi(emu)) < 0)
                         goto error;
         }
-        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0)
+        if ((err = snd_emu10k1_fx8010_new(emu, 0)) < 0)
                 goto error;
 #ifdef ENABLE_SYNTH
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 15933f92f63a..6d1b98d14327 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -847,15 +847,13 @@ static const struct snd_pcm_chmap_elem clfe_map[] = {
         { }
 };
 
-static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)
+static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device)
 {
         struct snd_pcm *pcm;
         const struct snd_pcm_chmap_elem *map = NULL;
         int err;
         int capture = 0;
   
-        if (rpcm)
-                *rpcm = NULL;
         if (device == 0)
                 capture = 1;
         
@@ -896,15 +894,8 @@ static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **r
                                               snd_dma_pci_data(emu->pci), 
                                               32*1024, 32*1024);
   
-        err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,
+        return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,
                                      1 << 2, NULL);
-        if (err < 0)
-                return err;
-
-        if (rpcm)
-                *rpcm = pcm;
-  
-        return 0;
 }
 
 static int snd_emu10k1x_create(struct snd_card *card,
@@ -1583,15 +1574,15 @@ static int snd_emu10k1x_probe(struct pci_dev *pci,
                 return err;
         }
 
-        if ((err = snd_emu10k1x_pcm(chip, 0, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 0)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_emu10k1x_pcm(chip, 1, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 1)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_emu10k1x_pcm(chip, 2, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 2)) < 0) {
                 snd_card_free(card);
                 return err;
         }
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index eb5c0aba41c1..56fc47bd6dba 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -2641,14 +2641,11 @@ static int snd_emu10k1_fx8010_release(struct snd_hwdep * hw, struct file *file)
         return 0;
 }
 
-int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device,
-                           struct snd_hwdep **rhwdep)
+int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device)
 {
         struct snd_hwdep *hw;
         int err;
         
-        if (rhwdep)
-                *rhwdep = NULL;
         if ((err = snd_hwdep_new(emu->card, "FX8010", device, &hw)) < 0)
                 return err;
         strcpy(hw->name, "EMU10K1 (FX8010)");
@@ -2657,8 +2654,6 @@ int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device,
         hw->ops.ioctl = snd_emu10k1_fx8010_ioctl;
         hw->ops.release = snd_emu10k1_fx8010_release;
         hw->private_data = emu;
-        if (rhwdep)
-                *rhwdep = hw;
         return 0;
 }
 
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index f82481bd2542..0dc07385af0e 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1400,15 +1400,12 @@ static struct snd_pcm_ops snd_emu10k1_efx_playback_ops = {
         .page =                 snd_pcm_sgbuf_ops_page,
 };
 
-int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
+int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)
 {
         struct snd_pcm *pcm;
         struct snd_pcm_substream *substream;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
-
         if ((err = snd_pcm_new(emu->card, "emu10k1", device, 32, 1, &pcm)) < 0)
                 return err;
 
@@ -1429,22 +1426,15 @@ int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
         for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream->next)
                 snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
 
-        if (rpcm)
-                *rpcm = pcm;
-
         return 0;
 }
 
-int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device,
-                          struct snd_pcm **rpcm)
+int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device)
 {
         struct snd_pcm *pcm;
         struct snd_pcm_substream *substream;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
-
         if ((err = snd_pcm_new(emu->card, "emu10k1", device, 1, 0, &pcm)) < 0)
                 return err;
 
@@ -1461,9 +1451,6 @@ int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device,
                 if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
                         return err;
 
-        if (rpcm)
-                *rpcm = pcm;
-
         return 0;
 }
 
@@ -1479,15 +1466,11 @@ static struct snd_pcm_ops snd_emu10k1_capture_mic_ops = {
         .pointer =              snd_emu10k1_capture_pointer,
 };
 
-int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device,
-                        struct snd_pcm **rpcm)
+int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device)
 {
         struct snd_pcm *pcm;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
-
         if ((err = snd_pcm_new(emu->card, "emu10k1 mic", device, 0, 1, &pcm)) < 0)
                 return err;
 
@@ -1501,8 +1484,6 @@ int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device,
 
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
 
-        if (rpcm)
-                *rpcm = pcm;
         return 0;
 }
 
@@ -1822,16 +1803,12 @@ static struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {
         .ack =                  snd_emu10k1_fx8010_playback_transfer,
 };
 
-int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device,
-                        struct snd_pcm **rpcm)
+int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)
 {
         struct snd_pcm *pcm;
         struct snd_kcontrol *kctl;
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
-
         if ((err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm)) < 0)
                 return err;
 
@@ -1843,8 +1820,6 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device,
         pcm->info_flags = 0;
         strcpy(pcm->name, "Multichannel Capture/PT Playback");
         emu->pcm_efx = pcm;
-        if (rpcm)
-                *rpcm = pcm;
 
         /* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs 
          * to these
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 7ef3898a7806..b672755815e1 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -640,7 +640,7 @@ int snd_p16v_free(struct snd_emu10k1 *chip)
         return 0;
 }
 
-int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
+int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)
 {
         struct snd_pcm *pcm;
         struct snd_pcm_substream *substream;
@@ -649,8 +649,6 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
   
         /* dev_dbg(emu->card->dev, "snd_p16v_pcm called. device=%d\n", device); */
         emu->p16v_device_offset = device;
-        if (rpcm)
-                *rpcm = NULL;
 
         if ((err = snd_pcm_new(emu->card, "p16v", device, 1, capture, &pcm)) < 0)
                 return err;
@@ -694,9 +692,6 @@ int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
                 */
         }
   
-        if (rpcm)
-                *rpcm = pcm;
-  
         return 0;
 }