diff options
Diffstat (limited to 'sound/pci/trident/trident_main.c')
-rw-r--r-- | sound/pci/trident/trident_main.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index b9b93c7faafd..62f109f020a5 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
@@ -2118,37 +2118,6 @@ static snd_pcm_ops_t snd_trident_spdif_7018_ops = { | |||
2118 | }; | 2118 | }; |
2119 | 2119 | ||
2120 | /*--------------------------------------------------------------------------- | 2120 | /*--------------------------------------------------------------------------- |
2121 | snd_trident_pcm_free | ||
2122 | |||
2123 | Description: This routine release the 4DWave private data. | ||
2124 | |||
2125 | Paramters: private_data - pointer to 4DWave device info. | ||
2126 | |||
2127 | Returns: None | ||
2128 | |||
2129 | ---------------------------------------------------------------------------*/ | ||
2130 | static void snd_trident_pcm_free(snd_pcm_t *pcm) | ||
2131 | { | ||
2132 | trident_t *trident = pcm->private_data; | ||
2133 | trident->pcm = NULL; | ||
2134 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
2135 | } | ||
2136 | |||
2137 | static void snd_trident_foldback_pcm_free(snd_pcm_t *pcm) | ||
2138 | { | ||
2139 | trident_t *trident = pcm->private_data; | ||
2140 | trident->foldback = NULL; | ||
2141 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
2142 | } | ||
2143 | |||
2144 | static void snd_trident_spdif_pcm_free(snd_pcm_t *pcm) | ||
2145 | { | ||
2146 | trident_t *trident = pcm->private_data; | ||
2147 | trident->spdif = NULL; | ||
2148 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
2149 | } | ||
2150 | |||
2151 | /*--------------------------------------------------------------------------- | ||
2152 | snd_trident_pcm | 2121 | snd_trident_pcm |
2153 | 2122 | ||
2154 | Description: This routine registers the 4DWave device for PCM support. | 2123 | Description: This routine registers the 4DWave device for PCM support. |
@@ -2170,7 +2139,6 @@ int __devinit snd_trident_pcm(trident_t * trident, int device, snd_pcm_t ** rpcm | |||
2170 | return err; | 2139 | return err; |
2171 | 2140 | ||
2172 | pcm->private_data = trident; | 2141 | pcm->private_data = trident; |
2173 | pcm->private_free = snd_trident_pcm_free; | ||
2174 | 2142 | ||
2175 | if (trident->tlb.entries) { | 2143 | if (trident->tlb.entries) { |
2176 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_trident_nx_playback_ops); | 2144 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_trident_nx_playback_ops); |
@@ -2232,7 +2200,6 @@ int __devinit snd_trident_foldback_pcm(trident_t * trident, int device, snd_pcm_ | |||
2232 | return err; | 2200 | return err; |
2233 | 2201 | ||
2234 | foldback->private_data = trident; | 2202 | foldback->private_data = trident; |
2235 | foldback->private_free = snd_trident_foldback_pcm_free; | ||
2236 | if (trident->tlb.entries) | 2203 | if (trident->tlb.entries) |
2237 | snd_pcm_set_ops(foldback, SNDRV_PCM_STREAM_CAPTURE, &snd_trident_nx_foldback_ops); | 2204 | snd_pcm_set_ops(foldback, SNDRV_PCM_STREAM_CAPTURE, &snd_trident_nx_foldback_ops); |
2238 | else | 2205 | else |
@@ -2285,7 +2252,6 @@ int __devinit snd_trident_spdif_pcm(trident_t * trident, int device, snd_pcm_t * | |||
2285 | return err; | 2252 | return err; |
2286 | 2253 | ||
2287 | spdif->private_data = trident; | 2254 | spdif->private_data = trident; |
2288 | spdif->private_free = snd_trident_spdif_pcm_free; | ||
2289 | if (trident->device != TRIDENT_DEVICE_ID_SI7018) { | 2255 | if (trident->device != TRIDENT_DEVICE_ID_SI7018) { |
2290 | snd_pcm_set_ops(spdif, SNDRV_PCM_STREAM_PLAYBACK, &snd_trident_spdif_ops); | 2256 | snd_pcm_set_ops(spdif, SNDRV_PCM_STREAM_PLAYBACK, &snd_trident_spdif_ops); |
2291 | } else { | 2257 | } else { |