diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-16 12:43:35 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:16:21 -0500 |
commit | c3e6f7d8763fa0400d28c57633eb323515ba05fc (patch) | |
tree | b0803843b710ac74fc1399910445a8ff2cf396a5 /sound/isa/sb | |
parent | f31a31b9024f21b2ad8f5a7c30e265a652e2e211 (diff) |
[ALSA] Remove superfluous pcm_free callbacks
Remove superflous pcm_free callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/sb')
-rw-r--r-- | sound/isa/sb/sb16_main.c | 6 | ||||
-rw-r--r-- | sound/isa/sb/sb8_main.c | 6 |
2 files changed, 0 insertions, 12 deletions
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 = { | |||
851 | .pointer = snd_sb16_capture_pointer, | 851 | .pointer = snd_sb16_capture_pointer, |
852 | }; | 852 | }; |
853 | 853 | ||
854 | static void snd_sb16dsp_pcm_free(snd_pcm_t *pcm) | ||
855 | { | ||
856 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
857 | } | ||
858 | |||
859 | int snd_sb16dsp_pcm(sb_t * chip, int device, snd_pcm_t ** rpcm) | 854 | int snd_sb16dsp_pcm(sb_t * chip, int device, snd_pcm_t ** rpcm) |
860 | { | 855 | { |
861 | snd_card_t *card = chip->card; | 856 | snd_card_t *card = chip->card; |
@@ -869,7 +864,6 @@ int snd_sb16dsp_pcm(sb_t * chip, int device, snd_pcm_t ** rpcm) | |||
869 | sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff); | 864 | sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff); |
870 | pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX; | 865 | pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX; |
871 | pcm->private_data = chip; | 866 | pcm->private_data = chip; |
872 | pcm->private_free = snd_sb16dsp_pcm_free; | ||
873 | 867 | ||
874 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); | 868 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); |
875 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops); | 869 | 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 = { | |||
507 | .pointer = snd_sb8_capture_pointer, | 507 | .pointer = snd_sb8_capture_pointer, |
508 | }; | 508 | }; |
509 | 509 | ||
510 | static void snd_sb8dsp_pcm_free(snd_pcm_t *pcm) | ||
511 | { | ||
512 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
513 | } | ||
514 | |||
515 | int snd_sb8dsp_pcm(sb_t *chip, int device, snd_pcm_t ** rpcm) | 510 | int snd_sb8dsp_pcm(sb_t *chip, int device, snd_pcm_t ** rpcm) |
516 | { | 511 | { |
517 | snd_card_t *card = chip->card; | 512 | snd_card_t *card = chip->card; |
@@ -525,7 +520,6 @@ int snd_sb8dsp_pcm(sb_t *chip, int device, snd_pcm_t ** rpcm) | |||
525 | sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff); | 520 | sprintf(pcm->name, "DSP v%i.%i", chip->version >> 8, chip->version & 0xff); |
526 | pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; | 521 | pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; |
527 | pcm->private_data = chip; | 522 | pcm->private_data = chip; |
528 | pcm->private_free = snd_sb8dsp_pcm_free; | ||
529 | 523 | ||
530 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb8_playback_ops); | 524 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb8_playback_ops); |
531 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb8_capture_ops); | 525 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb8_capture_ops); |