[ALSA] Remove superfluous pcm_free callbacks

Remove superflous pcm_free callbacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

10 files changed, 0 insertions, 74 deletions

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 7ae02396cae2..170409e26d03 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -662,13 +662,6 @@ static snd_pcm_ops_t snd_ad1816a_capture_ops = {
         .pointer =      snd_ad1816a_capture_pointer,
 };
 
-static void snd_ad1816a_pcm_free(snd_pcm_t *pcm)
-{
-        ad1816a_t *chip = pcm->private_data;
-        chip->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_ad1816a_pcm(ad1816a_t *chip, int device, snd_pcm_t **rpcm)
 {
         int error;
@@ -681,7 +674,6 @@ int snd_ad1816a_pcm(ad1816a_t *chip, int device, snd_pcm_t **rpcm)
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ad1816a_capture_ops);
 
         pcm->private_data = chip;
-        pcm->private_free = snd_ad1816a_pcm_free;
         pcm->info_flags = (chip->dma1 == chip->dma2 ) ? SNDRV_PCM_INFO_JOINT_DUPLEX : 0;
 
         strcpy(pcm->name, snd_ad1816a_chip_id(chip));
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 891bacc94f68..84a3c559655b 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -959,13 +959,6 @@ static snd_pcm_ops_t snd_ad1848_capture_ops = {
         .pointer =      snd_ad1848_capture_pointer,
 };
 
-static void snd_ad1848_pcm_free(snd_pcm_t *pcm)
-{
-        ad1848_t *chip = pcm->private_data;
-        chip->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_ad1848_pcm(ad1848_t *chip, int device, snd_pcm_t **rpcm)
 {
         snd_pcm_t *pcm;
@@ -977,7 +970,6 @@ int snd_ad1848_pcm(ad1848_t *chip, int device, snd_pcm_t **rpcm)
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ad1848_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ad1848_capture_ops);
 
-        pcm->private_free = snd_ad1848_pcm_free;
         pcm->private_data = chip;
         pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
         strcpy(pcm->name, snd_ad1848_chip_id(chip));
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 5252206ea388..6038529d5af2 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -388,11 +388,6 @@ static int snd_cmi8330_capture_open(snd_pcm_substream_t * substream)
         return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);
 }
 
-static void snd_cmi8330_pcm_free(snd_pcm_t *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int __devinit snd_cmi8330_pcm(snd_card_t *card, struct snd_cmi8330 *chip)
 {
         snd_pcm_t *pcm;
@@ -407,7 +402,6 @@ static int __devinit snd_cmi8330_pcm(snd_card_t *card, struct snd_cmi8330 *chip)
                 return err;
         strcpy(pcm->name, "CMI8330");
         pcm->private_data = chip;
-        pcm->private_free = snd_cmi8330_pcm_free;
         
         /* SB16 */
         ops = snd_sb16dsp_get_pcm_ops(CMI_SB_STREAM);
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index 4af769030beb..4c9fb168636b 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -1605,13 +1605,6 @@ static snd_pcm_ops_t snd_cs4231_capture_ops = {
         .pointer =      snd_cs4231_capture_pointer,
 };
 
-static void snd_cs4231_pcm_free(snd_pcm_t *pcm)
-{
-        cs4231_t *chip = pcm->private_data;
-        chip->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_cs4231_pcm(cs4231_t *chip, int device, snd_pcm_t **rpcm)
 {
         snd_pcm_t *pcm;
@@ -1629,7 +1622,6 @@ int snd_cs4231_pcm(cs4231_t *chip, int device, snd_pcm_t **rpcm)
         
         /* global setup */
         pcm->private_data = chip;
-        pcm->private_free = snd_cs4231_pcm_free;
         pcm->info_flags = 0;
         if (chip->single_dma)
                 pcm->info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 2edc9c9f0445..841e9ac8c664 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -724,13 +724,6 @@ static snd_pcm_ops_t snd_es1688_capture_ops = {
         .pointer =              snd_es1688_capture_pointer,
 };
 
-static void snd_es1688_pcm_free(snd_pcm_t *pcm)
-{
-        es1688_t *chip = pcm->private_data;
-        chip->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_es1688_pcm(es1688_t * chip, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -743,7 +736,6 @@ int snd_es1688_pcm(es1688_t * chip, int device, snd_pcm_t ** rpcm)
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_es1688_capture_ops);
 
         pcm->private_data = chip;
-        pcm->private_free = snd_es1688_pcm_free;
         pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
         sprintf(pcm->name, snd_es1688_chip_id(chip));
         chip->pcm = pcm;
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 970e2aaade27..7191ff90cc73 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1566,13 +1566,6 @@ static snd_pcm_ops_t snd_es18xx_capture_ops = {
         .pointer =      snd_es18xx_capture_pointer,
 };
 
-static void snd_es18xx_pcm_free(snd_pcm_t *pcm)
-{
-        es18xx_t *codec = pcm->private_data;
-        codec->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int __devinit snd_es18xx_pcm(es18xx_t *chip, int device, snd_pcm_t ** rpcm)
 {
         snd_pcm_t *pcm;
@@ -1595,7 +1588,6 @@ static int __devinit snd_es18xx_pcm(es18xx_t *chip, int device, snd_pcm_t ** rpc
 
         /* global setup */
         pcm->private_data = chip;
-        pcm->private_free = snd_es18xx_pcm_free;
         pcm->info_flags = 0;
         if (chip->caps & ES18XX_DUPLEX_SAME)
                 pcm->info_flags |= SNDRV_PCM_INFO_JOINT_DUPLEX;
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 1cc89fb67bf2..bae0fee705ee 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -727,13 +727,6 @@ static int snd_gf1_pcm_capture_close(snd_pcm_substream_t * substream)
         return 0;
 }
 
-static void snd_gf1_pcm_free(snd_pcm_t *pcm)
-{
-        snd_gus_card_t *gus = pcm->private_data;
-        gus->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int snd_gf1_pcm_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -860,7 +853,6 @@ int snd_gf1_pcm_new(snd_gus_card_t * gus, int pcm_dev, int control_index, snd_pc
         if (err < 0)
                 return err;
         pcm->private_data = gus;
-        pcm->private_free = snd_gf1_pcm_free;
         /* playback setup */
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_gf1_pcm_playback_ops);
 
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index b94339f8306f..1be32999dfe1 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1346,13 +1346,6 @@ static snd_pcm_ops_t snd_opti93x_capture_ops = {
         .pointer =      snd_opti93x_capture_pointer,
 };
 
-static void snd_opti93x_pcm_free(snd_pcm_t *pcm)
-{
-        opti93x_t *codec = pcm->private_data;
-        codec->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int snd_opti93x_pcm(opti93x_t *codec, int device, snd_pcm_t **rpcm)
 {
         int error;
@@ -1365,7 +1358,6 @@ static int snd_opti93x_pcm(opti93x_t *codec, int device, snd_pcm_t **rpcm)
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_opti93x_capture_ops);
 
         pcm->private_data = codec;
-        pcm->private_free = snd_opti93x_pcm_free;
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
 
         strcpy(pcm->name, snd_opti93x_chip_id(codec));
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 556b95e3e22f..17312e060a17 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -851,11 +851,6 @@ static snd_pcm_ops_t snd_sb16_capture_ops = {
         .pointer =      snd_sb16_capture_pointer,
 };
 
-static void snd_sb16dsp_pcm_free(snd_pcm_t *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_sb16dsp_pcm(sb_t * chip, int device, snd_pcm_t ** rpcm)
 {
         snd_card_t *card = chip->card;
@@ -869,7 +864,6 @@ int snd_sb16dsp_pcm(sb_t * chip, int device, snd_pcm_t ** rpcm)
         sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff);
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
         pcm->private_data = chip;
-        pcm->private_free = snd_sb16dsp_pcm_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index 5ddc6e41d909..28d8afdf6891 100644
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -507,11 +507,6 @@ static snd_pcm_ops_t snd_sb8_capture_ops = {
         .pointer =              snd_sb8_capture_pointer,
 };
 
-static void snd_sb8dsp_pcm_free(snd_pcm_t *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 int snd_sb8dsp_pcm(sb_t *chip, int device, snd_pcm_t ** rpcm)
 {
         snd_card_t *card = chip->card;
@@ -525,7 +520,6 @@ int snd_sb8dsp_pcm(sb_t *chip, int device, snd_pcm_t ** rpcm)
         sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff);
         pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
         pcm->private_data = chip;
-        pcm->private_free = snd_sb8dsp_pcm_free;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb8_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb8_capture_ops);