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/cs46xx/cs46xx_lib.c | |
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/cs46xx/cs46xx_lib.c')
-rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 9b8af5bcbb04..9a86148d7188 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c | |||
@@ -1574,35 +1574,7 @@ static snd_pcm_ops_t snd_cs46xx_capture_indirect_ops = { | |||
1574 | .ack = snd_cs46xx_capture_transfer, | 1574 | .ack = snd_cs46xx_capture_transfer, |
1575 | }; | 1575 | }; |
1576 | 1576 | ||
1577 | static void snd_cs46xx_pcm_free(snd_pcm_t *pcm) | ||
1578 | { | ||
1579 | cs46xx_t *chip = pcm->private_data; | ||
1580 | chip->pcm = NULL; | ||
1581 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1582 | } | ||
1583 | |||
1584 | #ifdef CONFIG_SND_CS46XX_NEW_DSP | 1577 | #ifdef CONFIG_SND_CS46XX_NEW_DSP |
1585 | static void snd_cs46xx_pcm_rear_free(snd_pcm_t *pcm) | ||
1586 | { | ||
1587 | cs46xx_t *chip = pcm->private_data; | ||
1588 | chip->pcm_rear = NULL; | ||
1589 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1590 | } | ||
1591 | |||
1592 | static void snd_cs46xx_pcm_center_lfe_free(snd_pcm_t *pcm) | ||
1593 | { | ||
1594 | cs46xx_t *chip = pcm->private_data; | ||
1595 | chip->pcm_center_lfe = NULL; | ||
1596 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1597 | } | ||
1598 | |||
1599 | static void snd_cs46xx_pcm_iec958_free(snd_pcm_t *pcm) | ||
1600 | { | ||
1601 | cs46xx_t *chip = pcm->private_data; | ||
1602 | chip->pcm_iec958 = NULL; | ||
1603 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
1604 | } | ||
1605 | |||
1606 | #define MAX_PLAYBACK_CHANNELS (DSP_MAX_PCM_CHANNELS - 1) | 1578 | #define MAX_PLAYBACK_CHANNELS (DSP_MAX_PCM_CHANNELS - 1) |
1607 | #else | 1579 | #else |
1608 | #define MAX_PLAYBACK_CHANNELS 1 | 1580 | #define MAX_PLAYBACK_CHANNELS 1 |
@@ -1619,7 +1591,6 @@ int __devinit snd_cs46xx_pcm(cs46xx_t *chip, int device, snd_pcm_t ** rpcm) | |||
1619 | return err; | 1591 | return err; |
1620 | 1592 | ||
1621 | pcm->private_data = chip; | 1593 | pcm->private_data = chip; |
1622 | pcm->private_free = snd_cs46xx_pcm_free; | ||
1623 | 1594 | ||
1624 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_ops); | 1595 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_ops); |
1625 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cs46xx_capture_ops); | 1596 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cs46xx_capture_ops); |
@@ -1652,7 +1623,6 @@ int __devinit snd_cs46xx_pcm_rear(cs46xx_t *chip, int device, snd_pcm_t ** rpcm) | |||
1652 | return err; | 1623 | return err; |
1653 | 1624 | ||
1654 | pcm->private_data = chip; | 1625 | pcm->private_data = chip; |
1655 | pcm->private_free = snd_cs46xx_pcm_rear_free; | ||
1656 | 1626 | ||
1657 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_rear_ops); | 1627 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_rear_ops); |
1658 | 1628 | ||
@@ -1682,7 +1652,6 @@ int __devinit snd_cs46xx_pcm_center_lfe(cs46xx_t *chip, int device, snd_pcm_t ** | |||
1682 | return err; | 1652 | return err; |
1683 | 1653 | ||
1684 | pcm->private_data = chip; | 1654 | pcm->private_data = chip; |
1685 | pcm->private_free = snd_cs46xx_pcm_center_lfe_free; | ||
1686 | 1655 | ||
1687 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_clfe_ops); | 1656 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_clfe_ops); |
1688 | 1657 | ||
@@ -1712,7 +1681,6 @@ int __devinit snd_cs46xx_pcm_iec958(cs46xx_t *chip, int device, snd_pcm_t ** rpc | |||
1712 | return err; | 1681 | return err; |
1713 | 1682 | ||
1714 | pcm->private_data = chip; | 1683 | pcm->private_data = chip; |
1715 | pcm->private_free = snd_cs46xx_pcm_iec958_free; | ||
1716 | 1684 | ||
1717 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_iec958_ops); | 1685 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs46xx_playback_iec958_ops); |
1718 | 1686 | ||