diff options
Diffstat (limited to 'sound/pci/ens1370.c')
-rw-r--r-- | sound/pci/ens1370.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index fa619a959d8c..180c49e4f6af 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -1214,13 +1214,6 @@ static snd_pcm_ops_t snd_ensoniq_capture_ops = { | |||
1214 | .pointer = snd_ensoniq_capture_pointer, | 1214 | .pointer = snd_ensoniq_capture_pointer, |
1215 | }; | 1215 | }; |
1216 | 1216 | ||
1217 | static void snd_ensoniq_pcm_free(snd_pcm_t *pcm) | ||
1218 | { | ||
1219 | ensoniq_t *ensoniq = pcm->private_data; | ||
1220 | ensoniq->pcm1 = NULL; | ||
1221 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1222 | } | ||
1223 | |||
1224 | static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm) | 1217 | static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm) |
1225 | { | 1218 | { |
1226 | snd_pcm_t *pcm; | 1219 | snd_pcm_t *pcm; |
@@ -1244,7 +1237,6 @@ static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t | |||
1244 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ensoniq_capture_ops); | 1237 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ensoniq_capture_ops); |
1245 | 1238 | ||
1246 | pcm->private_data = ensoniq; | 1239 | pcm->private_data = ensoniq; |
1247 | pcm->private_free = snd_ensoniq_pcm_free; | ||
1248 | pcm->info_flags = 0; | 1240 | pcm->info_flags = 0; |
1249 | #ifdef CHIP1370 | 1241 | #ifdef CHIP1370 |
1250 | strcpy(pcm->name, "ES1370 DAC2/ADC"); | 1242 | strcpy(pcm->name, "ES1370 DAC2/ADC"); |
@@ -1261,13 +1253,6 @@ static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t | |||
1261 | return 0; | 1253 | return 0; |
1262 | } | 1254 | } |
1263 | 1255 | ||
1264 | static void snd_ensoniq_pcm_free2(snd_pcm_t *pcm) | ||
1265 | { | ||
1266 | ensoniq_t *ensoniq = pcm->private_data; | ||
1267 | ensoniq->pcm2 = NULL; | ||
1268 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1269 | } | ||
1270 | |||
1271 | static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm) | 1256 | static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm) |
1272 | { | 1257 | { |
1273 | snd_pcm_t *pcm; | 1258 | snd_pcm_t *pcm; |
@@ -1289,7 +1274,6 @@ static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t | |||
1289 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ensoniq_playback2_ops); | 1274 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ensoniq_playback2_ops); |
1290 | #endif | 1275 | #endif |
1291 | pcm->private_data = ensoniq; | 1276 | pcm->private_data = ensoniq; |
1292 | pcm->private_free = snd_ensoniq_pcm_free2; | ||
1293 | pcm->info_flags = 0; | 1277 | pcm->info_flags = 0; |
1294 | #ifdef CHIP1370 | 1278 | #ifdef CHIP1370 |
1295 | strcpy(pcm->name, "ES1370 DAC1"); | 1279 | strcpy(pcm->name, "ES1370 DAC1"); |