aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/sparc')
-rw-r--r--sound/sparc/amd7930.c9
-rw-r--r--sound/sparc/cs4231.c8
2 files changed, 0 insertions, 17 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 46d504ba7e03..7d4b6855bac0 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -755,14 +755,6 @@ static snd_pcm_ops_t snd_amd7930_capture_ops = {
755 .pointer = snd_amd7930_capture_pointer, 755 .pointer = snd_amd7930_capture_pointer,
756}; 756};
757 757
758static void snd_amd7930_pcm_free(snd_pcm_t *pcm)
759{
760 amd7930_t *amd = pcm->private_data;
761
762 amd->pcm = NULL;
763 snd_pcm_lib_preallocate_free_for_all(pcm);
764}
765
766static int __init snd_amd7930_pcm(amd7930_t *amd) 758static int __init snd_amd7930_pcm(amd7930_t *amd)
767{ 759{
768 snd_pcm_t *pcm; 760 snd_pcm_t *pcm;
@@ -780,7 +772,6 @@ static int __init snd_amd7930_pcm(amd7930_t *amd)
780 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_amd7930_capture_ops); 772 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_amd7930_capture_ops);
781 773
782 pcm->private_data = amd; 774 pcm->private_data = amd;
783 pcm->private_free = snd_amd7930_pcm_free;
784 pcm->info_flags = 0; 775 pcm->info_flags = 0;
785 strcpy(pcm->name, amd->card->shortname); 776 strcpy(pcm->name, amd->card->shortname);
786 amd->pcm = pcm; 777 amd->pcm = pcm;
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 1f8d27a6152e..0fa482c9110b 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1385,13 +1385,6 @@ static snd_pcm_ops_t snd_cs4231_capture_ops = {
1385 .pointer = snd_cs4231_capture_pointer, 1385 .pointer = snd_cs4231_capture_pointer,
1386}; 1386};
1387 1387
1388static void snd_cs4231_pcm_free(snd_pcm_t *pcm)
1389{
1390 cs4231_t *chip = pcm->private_data;
1391 chip->pcm = NULL;
1392 snd_pcm_lib_preallocate_free_for_all(pcm);
1393}
1394
1395int snd_cs4231_pcm(cs4231_t *chip) 1388int snd_cs4231_pcm(cs4231_t *chip)
1396{ 1389{
1397 snd_pcm_t *pcm; 1390 snd_pcm_t *pcm;
@@ -1405,7 +1398,6 @@ int snd_cs4231_pcm(cs4231_t *chip)
1405 1398
1406 /* global setup */ 1399 /* global setup */
1407 pcm->private_data = chip; 1400 pcm->private_data = chip;
1408 pcm->private_free = snd_cs4231_pcm_free;
1409 pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX; 1401 pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
1410 strcpy(pcm->name, "CS4231"); 1402 strcpy(pcm->name, "CS4231");
1411 1403