aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r--sound/pci/ice1712/ice1712.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index bd71bf424549..b16c9c1c92c6 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -859,13 +859,6 @@ static snd_pcm_ops_t snd_ice1712_capture_ops = {
859 .pointer = snd_ice1712_capture_pointer, 859 .pointer = snd_ice1712_capture_pointer,
860}; 860};
861 861
862static void snd_ice1712_pcm_free(snd_pcm_t *pcm)
863{
864 ice1712_t *ice = pcm->private_data;
865 ice->pcm = NULL;
866 snd_pcm_lib_preallocate_free_for_all(pcm);
867}
868
869static int __devinit snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** rpcm) 862static int __devinit snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
870{ 863{
871 snd_pcm_t *pcm; 864 snd_pcm_t *pcm;
@@ -881,7 +874,6 @@ static int __devinit snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** r
881 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ice1712_capture_ops); 874 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ice1712_capture_ops);
882 875
883 pcm->private_data = ice; 876 pcm->private_data = ice;
884 pcm->private_free = snd_ice1712_pcm_free;
885 pcm->info_flags = 0; 877 pcm->info_flags = 0;
886 strcpy(pcm->name, "ICE1712 consumer"); 878 strcpy(pcm->name, "ICE1712 consumer");
887 ice->pcm = pcm; 879 ice->pcm = pcm;
@@ -897,13 +889,6 @@ static int __devinit snd_ice1712_pcm(ice1712_t * ice, int device, snd_pcm_t ** r
897 return 0; 889 return 0;
898} 890}
899 891
900static void snd_ice1712_pcm_free_ds(snd_pcm_t *pcm)
901{
902 ice1712_t *ice = pcm->private_data;
903 ice->pcm_ds = NULL;
904 snd_pcm_lib_preallocate_free_for_all(pcm);
905}
906
907static int __devinit snd_ice1712_pcm_ds(ice1712_t * ice, int device, snd_pcm_t ** rpcm) 892static int __devinit snd_ice1712_pcm_ds(ice1712_t * ice, int device, snd_pcm_t ** rpcm)
908{ 893{
909 snd_pcm_t *pcm; 894 snd_pcm_t *pcm;
@@ -918,7 +903,6 @@ static int __devinit snd_ice1712_pcm_ds(ice1712_t * ice, int device, snd_pcm_t *
918 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ice1712_playback_ds_ops); 903 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ice1712_playback_ds_ops);
919 904
920 pcm->private_data = ice; 905 pcm->private_data = ice;
921 pcm->private_free = snd_ice1712_pcm_free_ds;
922 pcm->info_flags = 0; 906 pcm->info_flags = 0;
923 strcpy(pcm->name, "ICE1712 consumer (DS)"); 907 strcpy(pcm->name, "ICE1712 consumer (DS)");
924 ice->pcm_ds = pcm; 908 ice->pcm_ds = pcm;
@@ -1223,13 +1207,6 @@ static int snd_ice1712_capture_pro_close(snd_pcm_substream_t * substream)
1223 return 0; 1207 return 0;
1224} 1208}
1225 1209
1226static void snd_ice1712_pcm_profi_free(snd_pcm_t *pcm)
1227{
1228 ice1712_t *ice = pcm->private_data;
1229 ice->pcm_pro = NULL;
1230 snd_pcm_lib_preallocate_free_for_all(pcm);
1231}
1232
1233static snd_pcm_ops_t snd_ice1712_playback_pro_ops = { 1210static snd_pcm_ops_t snd_ice1712_playback_pro_ops = {
1234 .open = snd_ice1712_playback_pro_open, 1211 .open = snd_ice1712_playback_pro_open,
1235 .close = snd_ice1712_playback_pro_close, 1212 .close = snd_ice1712_playback_pro_close,
@@ -1267,7 +1244,6 @@ static int __devinit snd_ice1712_pcm_profi(ice1712_t * ice, int device, snd_pcm_
1267 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ice1712_capture_pro_ops); 1244 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ice1712_capture_pro_ops);
1268 1245
1269 pcm->private_data = ice; 1246 pcm->private_data = ice;
1270 pcm->private_free = snd_ice1712_pcm_profi_free;
1271 pcm->info_flags = 0; 1247 pcm->info_flags = 0;
1272 strcpy(pcm->name, "ICE1712 multi"); 1248 strcpy(pcm->name, "ICE1712 multi");
1273 1249