diff options
Diffstat (limited to 'sound/isa/cs423x/cs4231.c')
-rw-r--r-- | sound/isa/cs423x/cs4231.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c index 7da28e7c0322..ddd289120aa8 100644 --- a/sound/isa/cs423x/cs4231.c +++ b/sound/isa/cs423x/cs4231.c | |||
@@ -91,7 +91,7 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n) | |||
91 | static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) | 91 | static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) |
92 | { | 92 | { |
93 | struct snd_card *card; | 93 | struct snd_card *card; |
94 | struct snd_cs4231 *chip; | 94 | struct snd_wss *chip; |
95 | struct snd_pcm *pcm; | 95 | struct snd_pcm *pcm; |
96 | int error; | 96 | int error; |
97 | 97 | ||
@@ -99,14 +99,14 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) | |||
99 | if (!card) | 99 | if (!card) |
100 | return -EINVAL; | 100 | return -EINVAL; |
101 | 101 | ||
102 | error = snd_cs4231_create(card, port[n], -1, irq[n], dma1[n], dma2[n], | 102 | error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n], |
103 | CS4231_HW_DETECT, 0, &chip); | 103 | WSS_HW_DETECT, 0, &chip); |
104 | if (error < 0) | 104 | if (error < 0) |
105 | goto out; | 105 | goto out; |
106 | 106 | ||
107 | card->private_data = chip; | 107 | card->private_data = chip; |
108 | 108 | ||
109 | error = snd_cs4231_pcm(chip, 0, &pcm); | 109 | error = snd_wss_pcm(chip, 0, &pcm); |
110 | if (error < 0) | 110 | if (error < 0) |
111 | goto out; | 111 | goto out; |
112 | 112 | ||
@@ -118,11 +118,11 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n) | |||
118 | if (dma2[n] >= 0) | 118 | if (dma2[n] >= 0) |
119 | sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]); | 119 | sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]); |
120 | 120 | ||
121 | error = snd_cs4231_mixer(chip); | 121 | error = snd_wss_mixer(chip); |
122 | if (error < 0) | 122 | if (error < 0) |
123 | goto out; | 123 | goto out; |
124 | 124 | ||
125 | error = snd_cs4231_timer(chip, 0, NULL); | 125 | error = snd_wss_timer(chip, 0, NULL); |
126 | if (error < 0) | 126 | if (error < 0) |
127 | goto out; | 127 | goto out; |
128 | 128 | ||
@@ -160,7 +160,7 @@ static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n) | |||
160 | static int snd_cs4231_suspend(struct device *dev, unsigned int n, pm_message_t state) | 160 | static int snd_cs4231_suspend(struct device *dev, unsigned int n, pm_message_t state) |
161 | { | 161 | { |
162 | struct snd_card *card = dev_get_drvdata(dev); | 162 | struct snd_card *card = dev_get_drvdata(dev); |
163 | struct snd_cs4231 *chip = card->private_data; | 163 | struct snd_wss *chip = card->private_data; |
164 | 164 | ||
165 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | 165 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); |
166 | chip->suspend(chip); | 166 | chip->suspend(chip); |
@@ -170,7 +170,7 @@ static int snd_cs4231_suspend(struct device *dev, unsigned int n, pm_message_t s | |||
170 | static int snd_cs4231_resume(struct device *dev, unsigned int n) | 170 | static int snd_cs4231_resume(struct device *dev, unsigned int n) |
171 | { | 171 | { |
172 | struct snd_card *card = dev_get_drvdata(dev); | 172 | struct snd_card *card = dev_get_drvdata(dev); |
173 | struct snd_cs4231 *chip = card->private_data; | 173 | struct snd_wss *chip = card->private_data; |
174 | 174 | ||
175 | chip->resume(chip); | 175 | chip->resume(chip); |
176 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | 176 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); |