diff options
Diffstat (limited to 'sound/pci/emu10k1/emupcm.c')
-rw-r--r-- | sound/pci/emu10k1/emupcm.c | 25 |
1 files changed, 0 insertions, 25 deletions
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 = { | |||
1249 | .page = snd_pcm_sgbuf_ops_page, | 1249 | .page = snd_pcm_sgbuf_ops_page, |
1250 | }; | 1250 | }; |
1251 | 1251 | ||
1252 | static void snd_emu10k1_pcm_free(snd_pcm_t *pcm) | ||
1253 | { | ||
1254 | emu10k1_t *emu = pcm->private_data; | ||
1255 | emu->pcm = NULL; | ||
1256 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1257 | } | ||
1258 | |||
1259 | int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) | 1252 | int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) |
1260 | { | 1253 | { |
1261 | snd_pcm_t *pcm; | 1254 | snd_pcm_t *pcm; |
@@ -1269,7 +1262,6 @@ int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) | |||
1269 | return err; | 1262 | return err; |
1270 | 1263 | ||
1271 | pcm->private_data = emu; | 1264 | pcm->private_data = emu; |
1272 | pcm->private_free = snd_emu10k1_pcm_free; | ||
1273 | 1265 | ||
1274 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_playback_ops); | 1266 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_playback_ops); |
1275 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_ops); | 1267 | 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 | |||
1305 | return err; | 1297 | return err; |
1306 | 1298 | ||
1307 | pcm->private_data = emu; | 1299 | pcm->private_data = emu; |
1308 | pcm->private_free = snd_emu10k1_pcm_free; | ||
1309 | 1300 | ||
1310 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_efx_playback_ops); | 1301 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_efx_playback_ops); |
1311 | 1302 | ||
@@ -1336,13 +1327,6 @@ static snd_pcm_ops_t snd_emu10k1_capture_mic_ops = { | |||
1336 | .pointer = snd_emu10k1_capture_pointer, | 1327 | .pointer = snd_emu10k1_capture_pointer, |
1337 | }; | 1328 | }; |
1338 | 1329 | ||
1339 | static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm) | ||
1340 | { | ||
1341 | emu10k1_t *emu = pcm->private_data; | ||
1342 | emu->pcm_mic = NULL; | ||
1343 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1344 | } | ||
1345 | |||
1346 | int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) | 1330 | int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) |
1347 | { | 1331 | { |
1348 | snd_pcm_t *pcm; | 1332 | snd_pcm_t *pcm; |
@@ -1355,7 +1339,6 @@ int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm | |||
1355 | return err; | 1339 | return err; |
1356 | 1340 | ||
1357 | pcm->private_data = emu; | 1341 | pcm->private_data = emu; |
1358 | pcm->private_free = snd_emu10k1_pcm_mic_free; | ||
1359 | 1342 | ||
1360 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_mic_ops); | 1343 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_mic_ops); |
1361 | 1344 | ||
@@ -1673,13 +1656,6 @@ static snd_pcm_ops_t snd_emu10k1_fx8010_playback_ops = { | |||
1673 | .ack = snd_emu10k1_fx8010_playback_transfer, | 1656 | .ack = snd_emu10k1_fx8010_playback_transfer, |
1674 | }; | 1657 | }; |
1675 | 1658 | ||
1676 | static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm) | ||
1677 | { | ||
1678 | emu10k1_t *emu = pcm->private_data; | ||
1679 | emu->pcm_efx = NULL; | ||
1680 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1681 | } | ||
1682 | |||
1683 | int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) | 1659 | int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm) |
1684 | { | 1660 | { |
1685 | snd_pcm_t *pcm; | 1661 | snd_pcm_t *pcm; |
@@ -1693,7 +1669,6 @@ int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm | |||
1693 | return err; | 1669 | return err; |
1694 | 1670 | ||
1695 | pcm->private_data = emu; | 1671 | pcm->private_data = emu; |
1696 | pcm->private_free = snd_emu10k1_pcm_efx_free; | ||
1697 | 1672 | ||
1698 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops); | 1673 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops); |
1699 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops); | 1674 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops); |