3 files changed, 0 insertions, 42 deletions

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 795577716a5d..ca402e994696 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -836,13 +836,6 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id,
         return IRQ_HANDLED;
 }
 
-static void snd_emu10k1x_pcm_free(snd_pcm_t *pcm)
-{
-        emu10k1x_t *emu = pcm->private_data;
-        emu->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int __devinit snd_emu10k1x_pcm(emu10k1x_t *emu, int device, snd_pcm_t **rpcm)
 {
         snd_pcm_t *pcm;
@@ -858,7 +851,6 @@ static int __devinit snd_emu10k1x_pcm(emu10k1x_t *emu, int device, snd_pcm_t **r
                 return err;
   
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1x_pcm_free;
         
         switch(device) {
         case 0:
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index bf7490dae09b..90d3a0b50d17 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1249,13 +1249,6 @@ static snd_pcm_ops_t snd_emu10k1_efx_playback_ops = {
         .page =                 snd_pcm_sgbuf_ops_page,
 };
 
-static void snd_emu10k1_pcm_free(snd_pcm_t *pcm)
-{
-        emu10k1_t *emu = pcm->private_data;
-        emu->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -1269,7 +1262,6 @@ int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
                 return err;
 
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1_pcm_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_ops);
@@ -1305,7 +1297,6 @@ int __devinit snd_emu10k1_pcm_multi(emu10k1_t * emu, int device, snd_pcm_t ** rp
                 return err;
 
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1_pcm_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_efx_playback_ops);
 
@@ -1336,13 +1327,6 @@ static snd_pcm_ops_t snd_emu10k1_capture_mic_ops = {
         .pointer =              snd_emu10k1_capture_pointer,
 };
 
-static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm)
-{
-        emu10k1_t *emu = pcm->private_data;
-        emu->pcm_mic = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -1355,7 +1339,6 @@ int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm
                 return err;
 
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1_pcm_mic_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_mic_ops);
 
@@ -1673,13 +1656,6 @@ static snd_pcm_ops_t snd_emu10k1_fx8010_playback_ops = {
         .ack =                  snd_emu10k1_fx8010_playback_transfer,
 };
 
-static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm)
-{
-        emu10k1_t *emu = pcm->private_data;
-        emu->pcm_efx = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -1693,7 +1669,6 @@ int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm
                 return err;
 
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1_pcm_efx_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index e27ebb9bb74a..3b456007ba2a 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -587,14 +587,6 @@ int snd_p16v_free(emu10k1_t *chip)
         return 0;
 }
 
-static void snd_p16v_pcm_free(snd_pcm_t *pcm)
-{
-        emu10k1_t *emu = pcm->private_data;
-        //snd_printk("snd_p16v_pcm_free pcm: called\n");
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-        emu->pcm = NULL;
-}
-
 int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
 {
         snd_pcm_t *pcm;
@@ -611,7 +603,6 @@ int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
                 return err;
   
         pcm->private_data = emu;
-        pcm->private_free = snd_p16v_pcm_free;
         // Single playback 8 channel device.
         // Single capture 2 channel device.
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_p16v_playback_front_ops);