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/pci/ymfpci | |
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/pci/ymfpci')
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 88a43e091d77..8229703c80cd 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -1071,13 +1071,6 @@ static snd_pcm_ops_t snd_ymfpci_capture_rec_ops = { | |||
1071 | .pointer = snd_ymfpci_capture_pointer, | 1071 | .pointer = snd_ymfpci_capture_pointer, |
1072 | }; | 1072 | }; |
1073 | 1073 | ||
1074 | static void snd_ymfpci_pcm_free(snd_pcm_t *pcm) | ||
1075 | { | ||
1076 | ymfpci_t *chip = pcm->private_data; | ||
1077 | chip->pcm = NULL; | ||
1078 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1079 | } | ||
1080 | |||
1081 | int __devinit snd_ymfpci_pcm(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | 1074 | int __devinit snd_ymfpci_pcm(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) |
1082 | { | 1075 | { |
1083 | snd_pcm_t *pcm; | 1076 | snd_pcm_t *pcm; |
@@ -1088,7 +1081,6 @@ int __devinit snd_ymfpci_pcm(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | |||
1088 | if ((err = snd_pcm_new(chip->card, "YMFPCI", device, 32, 1, &pcm)) < 0) | 1081 | if ((err = snd_pcm_new(chip->card, "YMFPCI", device, 32, 1, &pcm)) < 0) |
1089 | return err; | 1082 | return err; |
1090 | pcm->private_data = chip; | 1083 | pcm->private_data = chip; |
1091 | pcm->private_free = snd_ymfpci_pcm_free; | ||
1092 | 1084 | ||
1093 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_ops); | 1085 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_ops); |
1094 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ymfpci_capture_rec_ops); | 1086 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ymfpci_capture_rec_ops); |
@@ -1117,13 +1109,6 @@ static snd_pcm_ops_t snd_ymfpci_capture_ac97_ops = { | |||
1117 | .pointer = snd_ymfpci_capture_pointer, | 1109 | .pointer = snd_ymfpci_capture_pointer, |
1118 | }; | 1110 | }; |
1119 | 1111 | ||
1120 | static void snd_ymfpci_pcm2_free(snd_pcm_t *pcm) | ||
1121 | { | ||
1122 | ymfpci_t *chip = pcm->private_data; | ||
1123 | chip->pcm2 = NULL; | ||
1124 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1125 | } | ||
1126 | |||
1127 | int __devinit snd_ymfpci_pcm2(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | 1112 | int __devinit snd_ymfpci_pcm2(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) |
1128 | { | 1113 | { |
1129 | snd_pcm_t *pcm; | 1114 | snd_pcm_t *pcm; |
@@ -1134,7 +1119,6 @@ int __devinit snd_ymfpci_pcm2(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | |||
1134 | if ((err = snd_pcm_new(chip->card, "YMFPCI - PCM2", device, 0, 1, &pcm)) < 0) | 1119 | if ((err = snd_pcm_new(chip->card, "YMFPCI - PCM2", device, 0, 1, &pcm)) < 0) |
1135 | return err; | 1120 | return err; |
1136 | pcm->private_data = chip; | 1121 | pcm->private_data = chip; |
1137 | pcm->private_free = snd_ymfpci_pcm2_free; | ||
1138 | 1122 | ||
1139 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ymfpci_capture_ac97_ops); | 1123 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ymfpci_capture_ac97_ops); |
1140 | 1124 | ||
@@ -1163,13 +1147,6 @@ static snd_pcm_ops_t snd_ymfpci_playback_spdif_ops = { | |||
1163 | .pointer = snd_ymfpci_playback_pointer, | 1147 | .pointer = snd_ymfpci_playback_pointer, |
1164 | }; | 1148 | }; |
1165 | 1149 | ||
1166 | static void snd_ymfpci_pcm_spdif_free(snd_pcm_t *pcm) | ||
1167 | { | ||
1168 | ymfpci_t *chip = pcm->private_data; | ||
1169 | chip->pcm_spdif = NULL; | ||
1170 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1171 | } | ||
1172 | |||
1173 | int __devinit snd_ymfpci_pcm_spdif(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | 1150 | int __devinit snd_ymfpci_pcm_spdif(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) |
1174 | { | 1151 | { |
1175 | snd_pcm_t *pcm; | 1152 | snd_pcm_t *pcm; |
@@ -1180,7 +1157,6 @@ int __devinit snd_ymfpci_pcm_spdif(ymfpci_t *chip, int device, snd_pcm_t ** rpcm | |||
1180 | if ((err = snd_pcm_new(chip->card, "YMFPCI - IEC958", device, 1, 0, &pcm)) < 0) | 1157 | if ((err = snd_pcm_new(chip->card, "YMFPCI - IEC958", device, 1, 0, &pcm)) < 0) |
1181 | return err; | 1158 | return err; |
1182 | pcm->private_data = chip; | 1159 | pcm->private_data = chip; |
1183 | pcm->private_free = snd_ymfpci_pcm_spdif_free; | ||
1184 | 1160 | ||
1185 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_spdif_ops); | 1161 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_spdif_ops); |
1186 | 1162 | ||
@@ -1208,13 +1184,6 @@ static snd_pcm_ops_t snd_ymfpci_playback_4ch_ops = { | |||
1208 | .pointer = snd_ymfpci_playback_pointer, | 1184 | .pointer = snd_ymfpci_playback_pointer, |
1209 | }; | 1185 | }; |
1210 | 1186 | ||
1211 | static void snd_ymfpci_pcm_4ch_free(snd_pcm_t *pcm) | ||
1212 | { | ||
1213 | ymfpci_t *chip = pcm->private_data; | ||
1214 | chip->pcm_4ch = NULL; | ||
1215 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1216 | } | ||
1217 | |||
1218 | int __devinit snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | 1187 | int __devinit snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) |
1219 | { | 1188 | { |
1220 | snd_pcm_t *pcm; | 1189 | snd_pcm_t *pcm; |
@@ -1225,7 +1194,6 @@ int __devinit snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t ** rpcm) | |||
1225 | if ((err = snd_pcm_new(chip->card, "YMFPCI - Rear", device, 1, 0, &pcm)) < 0) | 1194 | if ((err = snd_pcm_new(chip->card, "YMFPCI - Rear", device, 1, 0, &pcm)) < 0) |
1226 | return err; | 1195 | return err; |
1227 | pcm->private_data = chip; | 1196 | pcm->private_data = chip; |
1228 | pcm->private_free = snd_ymfpci_pcm_4ch_free; | ||
1229 | 1197 | ||
1230 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_4ch_ops); | 1198 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ymfpci_playback_4ch_ops); |
1231 | 1199 | ||