ALSA: wss_lib: use wss mixer code instead of ad1848 one

[linux-block.git] / sound / isa / ad1848 / ad1848.c

diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index a4710b5e214c339f6549acddc739393dffc963cb..d5a96631587ceabd937813c1202836a55112a34d 100644 (file)
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/isa.h>
@@ -88,7 +87,7 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)
 static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)
 {
        struct snd_card *card;
-       struct snd_ad1848 *chip;
+       struct snd_wss *chip;
        struct snd_pcm *pcm;
        int error;
 
@@ -97,7 +96,7 @@ static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)
                return -EINVAL;
 
        error = snd_ad1848_create(card, port[n], irq[n], dma1[n],
-                       thinkpad[n] ? AD1848_HW_THINKPAD : AD1848_HW_DETECT, &chip);
+                       thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT, &chip);
        if (error < 0)
                goto out;
 
@@ -107,7 +106,7 @@ static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)
        if (error < 0)
                goto out;
 
-       error = snd_ad1848_mixer(chip);
+       error = snd_wss_mixer(chip);
        if (error < 0)
                goto out;
 
@@ -143,7 +142,7 @@ static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n)
 static int snd_ad1848_suspend(struct device *dev, unsigned int n, pm_message_t state)
 {
        struct snd_card *card = dev_get_drvdata(dev);
-       struct snd_ad1848 *chip = card->private_data;
+       struct snd_wss *chip = card->private_data;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
        chip->suspend(chip);
@@ -153,7 +152,7 @@ static int snd_ad1848_suspend(struct device *dev, unsigned int n, pm_message_t s
 static int snd_ad1848_resume(struct device *dev, unsigned int n)
 {
        struct snd_card *card = dev_get_drvdata(dev);
-       struct snd_ad1848 *chip = card->private_data;
+       struct snd_wss *chip = card->private_data;
 
        chip->resume(chip);
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);