ALSA: wss_lib: rename cs4321_foo to wss_foo

Rename functions and structures from the former
cs4321_lib to names more corresponding with the
new name: wss_lib.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

2 files changed, 34 insertions, 25 deletions

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 59f7c55baf30..4641daa7844d 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -1221,7 +1221,7 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n)
 
         int error;
         struct snd_miro *miro;
-        struct snd_cs4231 *codec;
+        struct snd_wss *codec;
         struct snd_timer *timer;
         struct snd_card *card;
         struct snd_pcm *pcm;
@@ -1310,29 +1310,32 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n)
                 }
         }
 
-        if ((error = snd_miro_configure(miro))) {
+        error = snd_miro_configure(miro);
+        if (error) {
                 snd_card_free(card);
                 return error;
         }
 
-        if ((error = snd_cs4231_create(card, miro->wss_base + 4, -1,
-                                       miro->irq, miro->dma1, miro->dma2,
-                                       CS4231_HW_AD1845,
-                                       0,
-                                       &codec)) < 0) {
+        error = snd_wss_create(card, miro->wss_base + 4, -1,
+                                miro->irq, miro->dma1, miro->dma2,
+                                WSS_HW_AD1845, 0, &codec);
+        if (error < 0) {
                 snd_card_free(card);
                 return error;
         }
 
-        if ((error = snd_cs4231_pcm(codec, 0, &pcm)) < 0) {
+        error = snd_wss_pcm(codec, 0, &pcm);
+        if (error < 0)  {
                 snd_card_free(card);
                 return error;
         }
-        if ((error = snd_cs4231_mixer(codec)) < 0) {
+        error = snd_wss_mixer(codec);
+        if (error < 0) {
                 snd_card_free(card);
                 return error;
         }
-        if ((error = snd_cs4231_timer(codec, 0, &timer)) < 0) {
+        error = snd_wss_timer(codec, 0, &timer);
+        if (error < 0) {
                 snd_card_free(card);
                 return error;
         }
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 93a03d9c7a95..fefb8597717c 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -139,7 +139,7 @@ struct snd_opti9xx {
         unsigned long mc_base_size;
 #ifdef OPTi93X
         unsigned long mc_indir_index;
-        struct snd_cs4231 *codec;
+        struct snd_wss *codec;
 #endif  /* OPTi93X */
         unsigned long pwd_reg;
 
@@ -562,7 +562,7 @@ __skip_mpu:
 
 static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)
 {
-        struct snd_cs4231 *codec = dev_id;
+        struct snd_wss *codec = dev_id;
         struct snd_opti9xx *chip = codec->card->private_data;
         unsigned char status;
 
@@ -570,7 +570,7 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)
         if ((status & OPTi93X_IRQ_PLAYBACK) && codec->playback_substream)
                 snd_pcm_period_elapsed(codec->playback_substream);
         if ((status & OPTi93X_IRQ_CAPTURE) && codec->capture_substream) {
-                snd_cs4231_overrange(codec);
+                snd_wss_overrange(codec);
                 snd_pcm_period_elapsed(codec->capture_substream);
         }
         outb(0x00, OPTi93X_PORT(codec, STATUS));
@@ -691,7 +691,7 @@ static void snd_card_opti9xx_free(struct snd_card *card)
         
         if (chip) {
 #ifdef OPTi93X
-                struct snd_cs4231 *codec = chip->codec;
+                struct snd_wss *codec = chip->codec;
                 if (codec && codec->irq > 0) {
                         disable_irq(codec->irq);
                         free_irq(codec->irq, codec);
@@ -707,7 +707,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
         int error;
         struct snd_opti9xx *chip = card->private_data;
 #if defined(CS4231) || defined(OPTi93X)
-        struct snd_cs4231 *codec;
+        struct snd_wss *codec;
 #ifdef CS4231
         struct snd_timer *timer;
 #endif
@@ -734,33 +734,39 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
 #endif
 
         if (chip->wss_base == SNDRV_AUTO_PORT) {
-                if ((chip->wss_base = snd_legacy_find_free_ioport(possible_ports, 4)) < 0) {
+                chip->wss_base = snd_legacy_find_free_ioport(possible_ports, 4);
+                if (chip->wss_base < 0) {
                         snd_printk("unable to find a free WSS port\n");
                         return -EBUSY;
                 }
         }
-        if ((error = snd_opti9xx_configure(chip)))
+        error = snd_opti9xx_configure(chip);
+        if (error)
                 return error;
 
 #if defined(CS4231) || defined(OPTi93X)
-        if ((error = snd_cs4231_create(card, chip->wss_base + 4, -1,
-                                       chip->irq, chip->dma1, chip->dma2,
+        error = snd_wss_create(card, chip->wss_base + 4, -1,
+                               chip->irq, chip->dma1, chip->dma2,
 #ifdef CS4231
-                                       CS4231_HW_DETECT, 0,
+                               WSS_HW_DETECT, 0,
 #else /* OPTi93x */
-                                       CS4231_HW_OPTI93X, CS4231_HWSHARE_IRQ,
+                               WSS_HW_OPTI93X, WSS_HWSHARE_IRQ,
 #endif
-                                       &codec)) < 0)
+                               &codec);
+        if (error < 0)
                 return error;
 #ifdef OPTi93X
         chip->codec = codec;
 #endif
-        if ((error = snd_cs4231_pcm(codec, 0, &pcm)) < 0)
+        error = snd_wss_pcm(codec, 0, &pcm);
+        if (error < 0)
                 return error;
-        if ((error = snd_cs4231_mixer(codec)) < 0)
+        error = snd_wss_mixer(codec);
+        if (error < 0)
                 return error;
 #ifdef CS4231
-        if ((error = snd_cs4231_timer(codec, 0, &timer)) < 0)
+        error = snd_wss_timer(codec, 0, &timer);
+        if (error < 0)
                 return error;
 #else /* OPTI93X */
         error = request_irq(chip->irq, snd_opti93x_interrupt,