aboutsummaryrefslogtreecommitdiff
path: root/sound/usb/usx2y
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-16 18:43:35 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:16:21 +0100
commitc3e6f7d8763fa0400d28c57633eb323515ba05fc (patch)
treeb0803843b710ac74fc1399910445a8ff2cf396a5 /sound/usb/usx2y
parentf31a31b9024f21b2ad8f5a7c30e265a652e2e211 (diff)
[ALSA] Remove superfluous pcm_free callbacks
Remove superflous pcm_free callbacks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usx2y')
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c4
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index affda973cec..c5989cb7db3 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -941,10 +941,8 @@ static void usX2Y_audio_stream_free(snd_usX2Y_substream_t **usX2Y_substream)
static void snd_usX2Y_pcm_private_free(snd_pcm_t *pcm)
{
snd_usX2Y_substream_t **usX2Y_stream = pcm->private_data;
- if (usX2Y_stream) {
- snd_pcm_lib_preallocate_free_for_all(pcm);
+ if (usX2Y_stream)
usX2Y_audio_stream_free(usX2Y_stream);
- }
}
static int usX2Y_audio_stream_new(snd_card_t *card, int playback_endpoint, int capture_endpoint)
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index c9136a98755..4bbf52bd602 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -740,12 +740,6 @@ static void snd_usX2Y_hwdep_pcm_private_free(snd_hwdep_t *hwdep)
}
-static void snd_usX2Y_usbpcm_private_free(snd_pcm_t *pcm)
-{
- snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-
int usX2Y_hwdep_pcm_new(snd_card_t* card)
{
int err;
@@ -776,7 +770,6 @@ int usX2Y_hwdep_pcm_new(snd_card_t* card)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usX2Y_usbpcm_ops);
pcm->private_data = usX2Y(card)->subs;
- pcm->private_free = snd_usX2Y_usbpcm_private_free;
pcm->info_flags = 0;
sprintf(pcm->name, NAME_ALLCAPS" hwdep Audio");
@@ -788,7 +781,6 @@ int usX2Y_hwdep_pcm_new(snd_card_t* card)
SNDRV_DMA_TYPE_CONTINUOUS,
snd_dma_continuous_data(GFP_KERNEL),
64*1024, 128*1024))) {
- snd_usX2Y_usbpcm_private_free(pcm);
return err;
}