[ALSA] Add even more 'const' to everything related to TLV
[linux-2.6.git] / sound / pci / via82xx.c
index b2779fb..a289922 100644 (file)
@@ -41,6 +41,9 @@
  *       device for applications.
  *     - clean up the code, separate low-level initialization
  *       routines for each chipset.
+ *
+ * Sep. 26, 2005       Karsten Wiese <annabellesgarden@yahoo.de>
+ *     - Optimize position calculation for the 823x chips. 
  */
 
 #include <sound/driver.h>
@@ -56,6 +59,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/info.h>
+#include <sound/tlv.h>
 #include <sound/ac97_codec.h>
 #include <sound/mpu401.h>
 #include <sound/initval.h>
@@ -102,7 +106,7 @@ MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2
 
 /* just for backward compatibility */
 static int enable;
-module_param(enable, int, 0444);
+module_param(enable, bool, 0444);
 
 
 /* revision numbers for via686 */
@@ -120,6 +124,7 @@ module_param(enable, int, 0444);
 #define VIA_REV_8233A          0x40    /* 1 rec, 1 multi-pb, spdf */
 #define VIA_REV_8235           0x50    /* 2 rec, 4 pb, 1 multi-pb, spdif */
 #define VIA_REV_8237           0x60
+#define VIA_REV_8251           0x70
 
 /*
  *  Direct registers
@@ -131,6 +136,7 @@ module_param(enable, int, 0444);
 /* common offsets */
 #define VIA_REG_OFFSET_STATUS          0x00    /* byte - channel status */
 #define   VIA_REG_STAT_ACTIVE          0x80    /* RO */
+#define   VIA8233_SHADOW_STAT_ACTIVE   0x08    /* RO */
 #define   VIA_REG_STAT_PAUSED          0x40    /* RO */
 #define   VIA_REG_STAT_TRIGGER_QUEUED  0x08    /* RO */
 #define   VIA_REG_STAT_STOPPED         0x04    /* RWC */
@@ -299,12 +305,6 @@ DEFINE_VIA_REGSET(CAPTURE_8233, 0x60);
 
 
 /*
- */
-
-typedef struct _snd_via82xx via82xx_t;
-typedef struct via_dev viadev_t;
-
-/*
  * pcm stream
  */
 
@@ -315,11 +315,11 @@ struct snd_via_sg_table {
 
 #define VIA_TABLE_SIZE 255
 
-struct via_dev {
+struct viadev {
        unsigned int reg_offset;
        unsigned long port;
        int direction;  /* playback = 0, capture = 1 */
-        snd_pcm_substream_t *substream;
+        struct snd_pcm_substream *substream;
        int running;
        unsigned int tbl_entries; /* # descriptors */
        struct snd_dma_buffer table;
@@ -329,6 +329,9 @@ struct via_dev {
        unsigned int fragsize;
        unsigned int bufsize;
        unsigned int bufsize2;
+       int hwptr_done;         /* processed frame position in the buffer */
+       int in_interrupt;
+       int shadow_shift;
 };
 
 
@@ -343,7 +346,7 @@ struct via_rate_lock {
        int used;
 };
 
-struct _snd_via82xx {
+struct via82xx {
        int irq;
 
        unsigned long port;
@@ -361,32 +364,33 @@ struct _snd_via82xx {
        unsigned int mpu_port_saved;
 #endif
 
-       unsigned char playback_volume[2]; /* for VIA8233/C/8235; default = 0 */
+       unsigned char playback_volume[4][2]; /* for VIA8233/C/8235; default = 0 */
+       unsigned char playback_volume_c[2]; /* for VIA8233/C/8235; default = 0 */
 
        unsigned int intr_mask; /* SGD_SHADOW mask to check interrupts */
 
        struct pci_dev *pci;
-       snd_card_t *card;
+       struct snd_card *card;
 
        unsigned int num_devs;
        unsigned int playback_devno, multi_devno, capture_devno;
-       viadev_t devs[VIA_MAX_DEVS];
+       struct viadev devs[VIA_MAX_DEVS];
        struct via_rate_lock rates[2]; /* playback and capture */
        unsigned int dxs_fixed: 1;      /* DXS channel accepts only 48kHz */
        unsigned int no_vra: 1;         /* no need to set VRA on DXS channels */
        unsigned int dxs_src: 1;        /* use full SRC capabilities of DXS */
        unsigned int spdif_on: 1;       /* only spdif rates work to external DACs */
 
-       snd_pcm_t *pcms[2];
-       snd_rawmidi_t *rmidi;
+       struct snd_pcm *pcms[2];
+       struct snd_rawmidi *rmidi;
 
-       ac97_bus_t *ac97_bus;
-       ac97_t *ac97;
+       struct snd_ac97_bus *ac97_bus;
+       struct snd_ac97 *ac97;
        unsigned int ac97_clock;
        unsigned int ac97_secondary;    /* secondary AC'97 codec is present */
 
        spinlock_t reg_lock;
-       snd_info_entry_t *proc_entry;
+       struct snd_info_entry *proc_entry;
 
 #ifdef SUPPORT_JOYSTICK
        struct gameport *gameport;
@@ -394,8 +398,10 @@ struct _snd_via82xx {
 };
 
 static struct pci_device_id snd_via82xx_ids[] = {
-       { 0x1106, 0x3058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, },    /* 686A */
-       { 0x1106, 0x3059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, },   /* VT8233 */
+       /* 0x1106, 0x3058 */
+       { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, },     /* 686A */
+       /* 0x1106, 0x3059 */
+       { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, },      /* VT8233 */
        { 0, }
 };
 
@@ -409,12 +415,12 @@ MODULE_DEVICE_TABLE(pci, snd_via82xx_ids);
  * periods = number of periods
  * fragsize = period size in bytes
  */
-static int build_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
+static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substream,
                           struct pci_dev *pci,
                           unsigned int periods, unsigned int fragsize)
 {
        unsigned int i, idx, ofs, rest;
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
        struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
 
        if (dev->table.area == NULL) {
@@ -477,7 +483,7 @@ static int build_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
 }
 
 
-static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
+static int clean_via_table(struct viadev *dev, struct snd_pcm_substream *substream,
                           struct pci_dev *pci)
 {
        if (dev->table.area) {
@@ -493,17 +499,17 @@ static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
  *  Basic I/O
  */
 
-static inline unsigned int snd_via82xx_codec_xread(via82xx_t *chip)
+static inline unsigned int snd_via82xx_codec_xread(struct via82xx *chip)
 {
        return inl(VIAREG(chip, AC97));
 }
  
-static inline void snd_via82xx_codec_xwrite(via82xx_t *chip, unsigned int val)
+static inline void snd_via82xx_codec_xwrite(struct via82xx *chip, unsigned int val)
 {
        outl(val, VIAREG(chip, AC97));
 }
  
-static int snd_via82xx_codec_ready(via82xx_t *chip, int secondary)
+static int snd_via82xx_codec_ready(struct via82xx *chip, int secondary)
 {
        unsigned int timeout = 1000;    /* 1ms */
        unsigned int val;
@@ -513,11 +519,12 @@ static int snd_via82xx_codec_ready(via82xx_t *chip, int secondary)
                if (!((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY))
                        return val & 0xffff;
        }
-       snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_via82xx_codec_xread(chip));
+       snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n",
+                  secondary, snd_via82xx_codec_xread(chip));
        return -EIO;
 }
  
-static int snd_via82xx_codec_valid(via82xx_t *chip, int secondary)
+static int snd_via82xx_codec_valid(struct via82xx *chip, int secondary)
 {
        unsigned int timeout = 1000;    /* 1ms */
        unsigned int val, val1;
@@ -534,22 +541,22 @@ static int snd_via82xx_codec_valid(via82xx_t *chip, int secondary)
        return -EIO;
 }
  
-static void snd_via82xx_codec_wait(ac97_t *ac97)
+static void snd_via82xx_codec_wait(struct snd_ac97 *ac97)
 {
-       via82xx_t *chip = ac97->private_data;
+       struct via82xx *chip = ac97->private_data;
        int err;
        err = snd_via82xx_codec_ready(chip, ac97->num);
        /* here we need to wait fairly for long time.. */
        msleep(500);
 }
 
-static void snd_via82xx_codec_write(ac97_t *ac97,
+static void snd_via82xx_codec_write(struct snd_ac97 *ac97,
                                    unsigned short reg,
                                    unsigned short val)
 {
-       via82xx_t *chip = ac97->private_data;
+       struct via82xx *chip = ac97->private_data;
        unsigned int xval;
-       
+
        xval = !ac97->num ? VIA_REG_AC97_CODEC_ID_PRIMARY : VIA_REG_AC97_CODEC_ID_SECONDARY;
        xval <<= VIA_REG_AC97_CODEC_ID_SHIFT;
        xval |= reg << VIA_REG_AC97_CMD_SHIFT;
@@ -558,9 +565,9 @@ static void snd_via82xx_codec_write(ac97_t *ac97,
        snd_via82xx_codec_ready(chip, ac97->num);
 }
 
-static unsigned short snd_via82xx_codec_read(ac97_t *ac97, unsigned short reg)
+static unsigned short snd_via82xx_codec_read(struct snd_ac97 *ac97, unsigned short reg)
 {
-       via82xx_t *chip = ac97->private_data;
+       struct via82xx *chip = ac97->private_data;
        unsigned int xval, val = 0xffff;
        int again = 0;
 
@@ -570,7 +577,8 @@ static unsigned short snd_via82xx_codec_read(ac97_t *ac97, unsigned short reg)
        xval |= (reg & 0x7f) << VIA_REG_AC97_CMD_SHIFT;
        while (1) {
                if (again++ > 3) {
-                       snd_printk(KERN_ERR "codec_read: codec %i is not valid [0x%x]\n", ac97->num, snd_via82xx_codec_xread(chip));
+                       snd_printk(KERN_ERR "codec_read: codec %i is not valid [0x%x]\n",
+                                  ac97->num, snd_via82xx_codec_xread(chip));
                        return 0xffff;
                }
                snd_via82xx_codec_xwrite(chip, xval);
@@ -584,7 +592,7 @@ static unsigned short snd_via82xx_codec_read(ac97_t *ac97, unsigned short reg)
        return val & 0xffff;
 }
 
-static void snd_via82xx_channel_reset(via82xx_t *chip, viadev_t *viadev)
+static void snd_via82xx_channel_reset(struct via82xx *chip, struct viadev *viadev)
 {
        outb(VIA_REG_CTRL_PAUSE | VIA_REG_CTRL_TERMINATE | VIA_REG_CTRL_RESET,
             VIADEV_REG(viadev, OFFSET_CONTROL));
@@ -597,16 +605,17 @@ static void snd_via82xx_channel_reset(via82xx_t *chip, viadev_t *viadev)
        outb(0x00, VIADEV_REG(viadev, OFFSET_TYPE)); /* for via686 */
        // outl(0, VIADEV_REG(viadev, OFFSET_CURR_PTR));
        viadev->lastpos = 0;
+       viadev->hwptr_done = 0;
 }
 
 
 /*
  *  Interrupt handler
+ *  Used for 686 and 8233A
  */
-
-static irqreturn_t snd_via82xx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_via686_interrupt(int irq, void *dev_id)
 {
-       via82xx_t *chip = dev_id;
+       struct via82xx *chip = dev_id;
        unsigned int status;
        unsigned int i;
 
@@ -614,22 +623,32 @@ static irqreturn_t snd_via82xx_interrupt(int irq, void *dev_id, struct pt_regs *
        if (! (status & chip->intr_mask)) {
                if (chip->rmidi)
                        /* check mpu401 interrupt */
-                       return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
+                       return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
                return IRQ_NONE;
        }
 
        /* check status for each stream */
        spin_lock(&chip->reg_lock);
        for (i = 0; i < chip->num_devs; i++) {
-               viadev_t *viadev = &chip->devs[i];
+               struct viadev *viadev = &chip->devs[i];
                unsigned char c_status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
-               c_status &= (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG|VIA_REG_STAT_STOPPED);
-               if (! c_status)
+               if (! (c_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG|VIA_REG_STAT_STOPPED)))
                        continue;
                if (viadev->substream && viadev->running) {
+                       /*
+                        * Update hwptr_done based on 'period elapsed'
+                        * interrupts. We'll use it, when the chip returns 0 
+                        * for OFFSET_CURR_COUNT.
+                        */
+                       if (c_status & VIA_REG_STAT_EOL)
+                               viadev->hwptr_done = 0;
+                       else
+                               viadev->hwptr_done += viadev->fragsize;
+                       viadev->in_interrupt = c_status;
                        spin_unlock(&chip->reg_lock);
                        snd_pcm_period_elapsed(viadev->substream);
                        spin_lock(&chip->reg_lock);
+                       viadev->in_interrupt = 0;
                }
                outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */
        }
@@ -638,16 +657,70 @@ static irqreturn_t snd_via82xx_interrupt(int irq, void *dev_id, struct pt_regs *
 }
 
 /*
+ *  Interrupt handler
+ */
+static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id)
+{
+       struct via82xx *chip = dev_id;
+       unsigned int status;
+       unsigned int i;
+       int irqreturn = 0;
+
+       /* check status for each stream */
+       spin_lock(&chip->reg_lock);
+       status = inl(VIAREG(chip, SGD_SHADOW));
+
+       for (i = 0; i < chip->num_devs; i++) {
+               struct viadev *viadev = &chip->devs[i];
+               struct snd_pcm_substream *substream;
+               unsigned char c_status, shadow_status;
+
+               shadow_status = (status >> viadev->shadow_shift) &
+                       (VIA8233_SHADOW_STAT_ACTIVE|VIA_REG_STAT_EOL|
+                        VIA_REG_STAT_FLAG);
+               c_status = shadow_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG);
+               if (!c_status)
+                       continue;
+
+               substream = viadev->substream;
+               if (substream && viadev->running) {
+                       /*
+                        * Update hwptr_done based on 'period elapsed'
+                        * interrupts. We'll use it, when the chip returns 0 
+                        * for OFFSET_CURR_COUNT.
+                        */
+                       if (c_status & VIA_REG_STAT_EOL)
+                               viadev->hwptr_done = 0;
+                       else
+                               viadev->hwptr_done += viadev->fragsize;
+                       viadev->in_interrupt = c_status;
+                       if (shadow_status & VIA8233_SHADOW_STAT_ACTIVE)
+                               viadev->in_interrupt |= VIA_REG_STAT_ACTIVE;
+                       spin_unlock(&chip->reg_lock);
+
+                       snd_pcm_period_elapsed(substream);
+
+                       spin_lock(&chip->reg_lock);
+                       viadev->in_interrupt = 0;
+               }
+               outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */
+               irqreturn = 1;
+       }
+       spin_unlock(&chip->reg_lock);
+       return IRQ_RETVAL(irqreturn);
+}
+
+/*
  *  PCM callbacks
  */
 
 /*
  * trigger callback
  */
-static int snd_via82xx_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
+static int snd_via82xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
        unsigned char val;
 
        if (chip->chip_type != TYPE_VIA686)
@@ -691,19 +764,24 @@ static int snd_via82xx_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
  */
 
 #define check_invalid_pos(viadev,pos) \
-       ((pos) < viadev->lastpos && ((pos) >= viadev->bufsize2 || viadev->lastpos < viadev->bufsize2))
+       ((pos) < viadev->lastpos && ((pos) >= viadev->bufsize2 ||\
+                                    viadev->lastpos < viadev->bufsize2))
 
-static inline unsigned int calc_linear_pos(viadev_t *viadev, unsigned int idx, unsigned int count)
+static inline unsigned int calc_linear_pos(struct viadev *viadev, unsigned int idx,
+                                          unsigned int count)
 {
        unsigned int size, base, res;
 
        size = viadev->idx_table[idx].size;
        base = viadev->idx_table[idx].offset;
        res = base + size - count;
+       if (res >= viadev->bufsize)
+               res -= viadev->bufsize;
 
        /* check the validity of the calculated position */
        if (size < count) {
-               snd_printd(KERN_ERR "invalid via82xx_cur_ptr (size = %d, count = %d)\n", (int)size, (int)count);
+               snd_printd(KERN_ERR "invalid via82xx_cur_ptr (size = %d, count = %d)\n",
+                          (int)size, (int)count);
                res = viadev->lastpos;
        } else {
                if (! count) {
@@ -719,29 +797,32 @@ static inline unsigned int calc_linear_pos(viadev_t *viadev, unsigned int idx, u
                }
                if (check_invalid_pos(viadev, res)) {
 #ifdef POINTER_DEBUG
-                       printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, count = 0x%x\n", idx, viadev->tbl_entries, viadev->lastpos, viadev->bufsize2, viadev->idx_table[idx].offset, viadev->idx_table[idx].size, count);
+                       printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, "
+                              "bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, "
+                              "count = 0x%x\n", idx, viadev->tbl_entries,
+                              viadev->lastpos, viadev->bufsize2,
+                              viadev->idx_table[idx].offset,
+                              viadev->idx_table[idx].size, count);
 #endif
                        /* count register returns full size when end of buffer is reached */
                        res = base + size;
                        if (check_invalid_pos(viadev, res)) {
-                               snd_printd(KERN_ERR "invalid via82xx_cur_ptr (2), using last valid pointer\n");
+                               snd_printd(KERN_ERR "invalid via82xx_cur_ptr (2), "
+                                          "using last valid pointer\n");
                                res = viadev->lastpos;
                        }
                }
        }
-       viadev->lastpos = res; /* remember the last position */
-       if (res >= viadev->bufsize)
-               res -= viadev->bufsize;
        return res;
 }
 
 /*
  * get the current pointer on via686
  */
-static snd_pcm_uframes_t snd_via686_pcm_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_via686_pcm_pointer(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
        unsigned int idx, ptr, count, res;
 
        snd_assert(viadev->tbl_entries, return 0);
@@ -759,6 +840,7 @@ static snd_pcm_uframes_t snd_via686_pcm_pointer(snd_pcm_substream_t *substream)
        else /* CURR_PTR holds the address + 8 */
                idx = ((ptr - (unsigned int)viadev->table.addr) / 8 - 1) % viadev->tbl_entries;
        res = calc_linear_pos(viadev, idx, count);
+       viadev->lastpos = res; /* remember the last position */
        spin_unlock(&chip->reg_lock);
 
        return bytes_to_frames(substream->runtime, res);
@@ -767,35 +849,55 @@ static snd_pcm_uframes_t snd_via686_pcm_pointer(snd_pcm_substream_t *substream)
 /*
  * get the current pointer on via823x
  */
-static snd_pcm_uframes_t snd_via8233_pcm_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_via8233_pcm_pointer(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
        unsigned int idx, count, res;
-       int timeout = 5000;
+       int status;
        
        snd_assert(viadev->tbl_entries, return 0);
-       if (!(inb(VIADEV_REG(viadev, OFFSET_STATUS)) & VIA_REG_STAT_ACTIVE))
-               return 0;
+
        spin_lock(&chip->reg_lock);
-       do {
-               count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT));
-               /* some mobos read 0 count */
-               if ((count & 0xffffff) || ! viadev->running)
-                       break;
-       } while (--timeout);
-       if (! timeout)
-               snd_printd(KERN_ERR "zero position is read\n");
-       idx = count >> 24;
-       if (idx >= viadev->tbl_entries) {
+       count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT));
+       status = viadev->in_interrupt;
+       if (!status)
+               status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
+
+       /* An apparent bug in the 8251 is worked around by sending a 
+        * REG_CTRL_START. */
+       if (chip->revision == VIA_REV_8251 && (status & VIA_REG_STAT_EOL))
+               snd_via82xx_pcm_trigger(substream, SNDRV_PCM_TRIGGER_START);
+
+       if (!(status & VIA_REG_STAT_ACTIVE)) {
+               res = 0;
+               goto unlock;
+       }
+       if (count & 0xffffff) {
+               idx = count >> 24;
+               if (idx >= viadev->tbl_entries) {
 #ifdef POINTER_DEBUG
-               printk("fail: invalid idx = %i/%i\n", idx, viadev->tbl_entries);
+                       printk(KERN_DEBUG "fail: invalid idx = %i/%i\n", idx,
+                              viadev->tbl_entries);
 #endif
-               res = viadev->lastpos;
+                       res = viadev->lastpos;
+               } else {
+                       count &= 0xffffff;
+                       res = calc_linear_pos(viadev, idx, count);
+               }
        } else {
-               count &= 0xffffff;
-               res = calc_linear_pos(viadev, idx, count);
-       }
+               res = viadev->hwptr_done;
+               if (!viadev->in_interrupt) {
+                       if (status & VIA_REG_STAT_EOL) {
+                               res = 0;
+                       } else
+                               if (status & VIA_REG_STAT_FLAG) {
+                                       res += viadev->fragsize;
+                               }
+               }
+       }                           
+unlock:
+       viadev->lastpos = res;
        spin_unlock(&chip->reg_lock);
 
        return bytes_to_frames(substream->runtime, res);
@@ -806,11 +908,11 @@ static snd_pcm_uframes_t snd_via8233_pcm_pointer(snd_pcm_substream_t *substream)
  * hw_params callback:
  * allocate the buffer and build up the buffer description table
  */
-static int snd_via82xx_hw_params(snd_pcm_substream_t * substream,
-                                snd_pcm_hw_params_t * hw_params)
+static int snd_via82xx_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *hw_params)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
        int err;
 
        err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
@@ -829,10 +931,10 @@ static int snd_via82xx_hw_params(snd_pcm_substream_t * substream,
  * hw_free callback:
  * clean up the buffer description table and release the buffer
  */
-static int snd_via82xx_hw_free(snd_pcm_substream_t * substream)
+static int snd_via82xx_hw_free(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
 
        clean_via_table(viadev, substream, chip->pci);
        snd_pcm_lib_free_pages(substream);
@@ -843,7 +945,7 @@ static int snd_via82xx_hw_free(snd_pcm_substream_t * substream)
 /*
  * set up the table pointer
  */
-static void snd_via82xx_set_table_ptr(via82xx_t *chip, viadev_t *viadev)
+static void snd_via82xx_set_table_ptr(struct via82xx *chip, struct viadev *viadev)
 {
        snd_via82xx_codec_ready(chip, 0);
        outl((u32)viadev->table.addr, VIADEV_REG(viadev, OFFSET_TABLE_PTR));
@@ -854,7 +956,8 @@ static void snd_via82xx_set_table_ptr(via82xx_t *chip, viadev_t *viadev)
 /*
  * prepare callback for playback and capture on via686
  */
-static void via686_setup_format(via82xx_t *chip, viadev_t *viadev, snd_pcm_runtime_t *runtime)
+static void via686_setup_format(struct via82xx *chip, struct viadev *viadev,
+                               struct snd_pcm_runtime *runtime)
 {
        snd_via82xx_channel_reset(chip, viadev);
        /* this must be set after channel_reset */
@@ -867,11 +970,11 @@ static void via686_setup_format(via82xx_t *chip, viadev_t *viadev, snd_pcm_runti
             VIA_REG_TYPE_INT_FLAG, VIADEV_REG(viadev, OFFSET_TYPE));
 }
 
-static int snd_via686_playback_prepare(snd_pcm_substream_t *substream)
+static int snd_via686_playback_prepare(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate);
        snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
@@ -879,11 +982,11 @@ static int snd_via686_playback_prepare(snd_pcm_substream_t *substream)
        return 0;
 }
 
-static int snd_via686_capture_prepare(snd_pcm_substream_t *substream)
+static int snd_via686_capture_prepare(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        snd_ac97_set_rate(chip->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate);
        via686_setup_format(chip, viadev, runtime);
@@ -913,11 +1016,11 @@ static int via_lock_rate(struct via_rate_lock *rec, int rate)
 /*
  * prepare callback for DSX playback on via823x
  */
-static int snd_via8233_playback_prepare(snd_pcm_substream_t *substream)
+static int snd_via8233_playback_prepare(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int ac97_rate = chip->dxs_src ? 48000 : runtime->rate;
        int rate_changed;
        u32 rbits;
@@ -933,12 +1036,15 @@ static int snd_via8233_playback_prepare(snd_pcm_substream_t *substream)
        if (runtime->rate == 48000)
                rbits = 0xfffff;
        else
-               rbits = (0x100000 / 48000) * runtime->rate + ((0x100000 % 48000) * runtime->rate) / 48000;
+               rbits = (0x100000 / 48000) * runtime->rate +
+                       ((0x100000 % 48000) * runtime->rate) / 48000;
        snd_assert((rbits & ~0xfffff) == 0, return -EINVAL);
        snd_via82xx_channel_reset(chip, viadev);
        snd_via82xx_set_table_ptr(chip, viadev);
-       outb(chip->playback_volume[0], VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_L));
-       outb(chip->playback_volume[1], VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_R));
+       outb(chip->playback_volume[viadev->reg_offset / 0x10][0],
+            VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_L));
+       outb(chip->playback_volume[viadev->reg_offset / 0x10][1],
+            VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_R));
        outl((runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA8233_REG_TYPE_16BIT : 0) | /* format */
             (runtime->channels > 1 ? VIA8233_REG_TYPE_STEREO : 0) | /* stereo */
             rbits | /* rate */
@@ -952,11 +1058,11 @@ static int snd_via8233_playback_prepare(snd_pcm_substream_t *substream)
 /*
  * prepare callback for multi-channel playback on via823x
  */
-static int snd_via8233_multi_prepare(snd_pcm_substream_t *substream)
+static int snd_via8233_multi_prepare(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int slots;
        int fmt;
 
@@ -969,7 +1075,8 @@ static int snd_via8233_multi_prepare(snd_pcm_substream_t *substream)
        snd_via82xx_channel_reset(chip, viadev);
        snd_via82xx_set_table_ptr(chip, viadev);
 
-       fmt = (runtime->format == SNDRV_PCM_FORMAT_S16_LE) ? VIA_REG_MULTPLAY_FMT_16BIT : VIA_REG_MULTPLAY_FMT_8BIT;
+       fmt = (runtime->format == SNDRV_PCM_FORMAT_S16_LE) ?
+               VIA_REG_MULTPLAY_FMT_16BIT : VIA_REG_MULTPLAY_FMT_8BIT;
        fmt |= runtime->channels << 4;
        outb(fmt, VIADEV_REG(viadev, OFS_MULTPLAY_FORMAT));
 #if 0
@@ -1000,11 +1107,11 @@ static int snd_via8233_multi_prepare(snd_pcm_substream_t *substream)
 /*
  * prepare callback for capture on via823x
  */
-static int snd_via8233_capture_prepare(snd_pcm_substream_t *substream)
+static int snd_via8233_capture_prepare(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        if (via_lock_rate(&chip->rates[1], runtime->rate) < 0)
                return -EINVAL;
@@ -1025,7 +1132,7 @@ static int snd_via8233_capture_prepare(snd_pcm_substream_t *substream)
 /*
  * pcm hardware definition, identical for both playback and capture
  */
-static snd_pcm_hardware_t snd_via82xx_hw =
+static struct snd_pcm_hardware snd_via82xx_hw =
 {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -1050,9 +1157,10 @@ static snd_pcm_hardware_t snd_via82xx_hw =
 /*
  * open callback skeleton
  */
-static int snd_via82xx_pcm_open(via82xx_t *chip, viadev_t *viadev, snd_pcm_substream_t * substream)
+static int snd_via82xx_pcm_open(struct via82xx *chip, struct viadev *viadev,
+                               struct snd_pcm_substream *substream)
 {
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int err;
        struct via_rate_lock *ratep;
 
@@ -1102,10 +1210,10 @@ static int snd_via82xx_pcm_open(via82xx_t *chip, viadev_t *viadev, snd_pcm_subst
 /*
  * open callback for playback on via686 and via823x DSX
  */
-static int snd_via82xx_playback_open(snd_pcm_substream_t * substream)
+static int snd_via82xx_playback_open(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = &chip->devs[chip->playback_devno + substream->number];
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = &chip->devs[chip->playback_devno + substream->number];
        int err;
 
        if ((err = snd_via82xx_pcm_open(chip, viadev, substream)) < 0)
@@ -1116,10 +1224,10 @@ static int snd_via82xx_playback_open(snd_pcm_substream_t * substream)
 /*
  * open callback for playback on via823x multi-channel
  */
-static int snd_via8233_multi_open(snd_pcm_substream_t * substream)
+static int snd_via8233_multi_open(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = &chip->devs[chip->multi_devno];
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = &chip->devs[chip->multi_devno];
        int err;
        /* channels constraint for VIA8233A
         * 3 and 5 channels are not supported
@@ -1127,7 +1235,7 @@ static int snd_via8233_multi_open(snd_pcm_substream_t * substream)
        static unsigned int channels[] = {
                1, 2, 4, 6
        };
-       static snd_pcm_hw_constraint_list_t hw_constraints_channels = {
+       static struct snd_pcm_hw_constraint_list hw_constraints_channels = {
                .count = ARRAY_SIZE(channels),
                .list = channels,
                .mask = 0,
@@ -1137,17 +1245,19 @@ static int snd_via8233_multi_open(snd_pcm_substream_t * substream)
                return err;
        substream->runtime->hw.channels_max = 6;
        if (chip->revision == VIA_REV_8233A)
-               snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels);
+               snd_pcm_hw_constraint_list(substream->runtime, 0,
+                                          SNDRV_PCM_HW_PARAM_CHANNELS,
+                                          &hw_constraints_channels);
        return 0;
 }
 
 /*
  * open callback for capture on via686 and via823x
  */
-static int snd_via82xx_capture_open(snd_pcm_substream_t * substream)
+static int snd_via82xx_capture_open(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = &chip->devs[chip->capture_devno + substream->pcm->device];
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = &chip->devs[chip->capture_devno + substream->pcm->device];
 
        return snd_via82xx_pcm_open(chip, viadev, substream);
 }
@@ -1155,10 +1265,10 @@ static int snd_via82xx_capture_open(snd_pcm_substream_t * substream)
 /*
  * close callback
  */
-static int snd_via82xx_pcm_close(snd_pcm_substream_t * substream)
+static int snd_via82xx_pcm_close(struct snd_pcm_substream *substream)
 {
-       via82xx_t *chip = snd_pcm_substream_chip(substream);
-       viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
+       struct via82xx *chip = snd_pcm_substream_chip(substream);
+       struct viadev *viadev = substream->runtime->private_data;
        struct via_rate_lock *ratep;
 
        /* release the rate lock */
@@ -1168,14 +1278,25 @@ static int snd_via82xx_pcm_close(snd_pcm_substream_t * substream)
        if (! ratep->used)
                ratep->rate = 0;
        spin_unlock_irq(&ratep->lock);
-
+       if (! ratep->rate) {
+               if (! viadev->direction) {
+                       snd_ac97_update_power(chip->ac97,
+                                             AC97_PCM_FRONT_DAC_RATE, 0);
+                       snd_ac97_update_power(chip->ac97,
+                                             AC97_PCM_SURR_DAC_RATE, 0);
+                       snd_ac97_update_power(chip->ac97,
+                                             AC97_PCM_LFE_DAC_RATE, 0);
+               } else
+                       snd_ac97_update_power(chip->ac97,
+                                             AC97_PCM_LR_ADC_RATE, 0);
+       }
        viadev->substream = NULL;
        return 0;
 }
 
 
 /* via686 playback callbacks */
-static snd_pcm_ops_t snd_via686_playback_ops = {
+static struct snd_pcm_ops snd_via686_playback_ops = {
        .open =         snd_via82xx_playback_open,
        .close =        snd_via82xx_pcm_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1188,7 +1309,7 @@ static snd_pcm_ops_t snd_via686_playback_ops = {
 };
 
 /* via686 capture callbacks */
-static snd_pcm_ops_t snd_via686_capture_ops = {
+static struct snd_pcm_ops snd_via686_capture_ops = {
        .open =         snd_via82xx_capture_open,
        .close =        snd_via82xx_pcm_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1201,7 +1322,7 @@ static snd_pcm_ops_t snd_via686_capture_ops = {
 };
 
 /* via823x DSX playback callbacks */
-static snd_pcm_ops_t snd_via8233_playback_ops = {
+static struct snd_pcm_ops snd_via8233_playback_ops = {
        .open =         snd_via82xx_playback_open,
        .close =        snd_via82xx_pcm_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1214,7 +1335,7 @@ static snd_pcm_ops_t snd_via8233_playback_ops = {
 };
 
 /* via823x multi-channel playback callbacks */
-static snd_pcm_ops_t snd_via8233_multi_ops = {
+static struct snd_pcm_ops snd_via8233_multi_ops = {
        .open =         snd_via8233_multi_open,
        .close =        snd_via82xx_pcm_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1227,7 +1348,7 @@ static snd_pcm_ops_t snd_via8233_multi_ops = {
 };
 
 /* via823x capture callbacks */
-static snd_pcm_ops_t snd_via8233_capture_ops = {
+static struct snd_pcm_ops snd_via8233_capture_ops = {
        .open =         snd_via82xx_capture_open,
        .close =        snd_via82xx_pcm_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1240,9 +1361,11 @@ static snd_pcm_ops_t snd_via8233_capture_ops = {
 };
 
 
-static void init_viadev(via82xx_t *chip, int idx, unsigned int reg_offset, int direction)
+static void init_viadev(struct via82xx *chip, int idx, unsigned int reg_offset,
+                       int shadow_pos, int direction)
 {
        chip->devs[idx].reg_offset = reg_offset;
+       chip->devs[idx].shadow_shift = shadow_pos * 4;
        chip->devs[idx].direction = direction;
        chip->devs[idx].port = chip->port + reg_offset;
 }
@@ -1250,9 +1373,9 @@ static void init_viadev(via82xx_t *chip, int idx, unsigned int reg_offset, int d
 /*
  * create pcm instances for VIA8233, 8233C and 8235 (not 8233A)
  */
-static int __devinit snd_via8233_pcm_new(via82xx_t *chip)
+static int __devinit snd_via8233_pcm_new(struct via82xx *chip)
 {
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
        int i, err;
 
        chip->playback_devno = 0;       /* x 4 */
@@ -1272,12 +1395,13 @@ static int __devinit snd_via8233_pcm_new(via82xx_t *chip)
        chip->pcms[0] = pcm;
        /* set up playbacks */
        for (i = 0; i < 4; i++)
-               init_viadev(chip, i, 0x10 * i, 0);
+               init_viadev(chip, i, 0x10 * i, i, 0);
        /* capture */
-       init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 1);
+       init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
 
        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci), 64*1024, 128*1024)) < 0)
+                                                        snd_dma_pci_data(chip->pci),
+                                                        64*1024, 128*1024)) < 0)
                return err;
 
        /* PCM #1:  multi-channel playback and 2nd capture */
@@ -1290,12 +1414,13 @@ static int __devinit snd_via8233_pcm_new(via82xx_t *chip)
        strcpy(pcm->name, chip->card->shortname);
        chip->pcms[1] = pcm;
        /* set up playback */
-       init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 0);
+       init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0);
        /* set up capture */
-       init_viadev(chip, chip->capture_devno + 1, VIA_REG_CAPTURE_8233_STATUS + 0x10, 1);
+       init_viadev(chip, chip->capture_devno + 1, VIA_REG_CAPTURE_8233_STATUS + 0x10, 7, 1);
 
        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci), 64*1024, 128*1024)) < 0)
+                                                        snd_dma_pci_data(chip->pci),
+                                                        64*1024, 128*1024)) < 0)
                return err;
 
        return 0;
@@ -1304,9 +1429,9 @@ static int __devinit snd_via8233_pcm_new(via82xx_t *chip)
 /*
  * create pcm instances for VIA8233A
  */
-static int __devinit snd_via8233a_pcm_new(via82xx_t *chip)
+static int __devinit snd_via8233a_pcm_new(struct via82xx *chip)
 {
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
        int err;
 
        chip->multi_devno = 0;
@@ -1325,12 +1450,13 @@ static int __devinit snd_via8233a_pcm_new(via82xx_t *chip)
        strcpy(pcm->name, chip->card->shortname);
        chip->pcms[0] = pcm;
        /* set up playback */
-       init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 0);
+       init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0);
        /* capture */
-       init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 1);
+       init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
 
        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci), 64*1024, 128*1024)) < 0)
+                                                        snd_dma_pci_data(chip->pci),
+                                                        64*1024, 128*1024)) < 0)
                return err;
 
        /* SPDIF supported? */
@@ -1346,10 +1472,11 @@ static int __devinit snd_via8233a_pcm_new(via82xx_t *chip)
        strcpy(pcm->name, chip->card->shortname);
        chip->pcms[1] = pcm;
        /* set up playback */
-       init_viadev(chip, chip->playback_devno, 0x30, 0);
+       init_viadev(chip, chip->playback_devno, 0x30, 3, 0);
 
        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci), 64*1024, 128*1024)) < 0)
+                                                        snd_dma_pci_data(chip->pci),
+                                                        64*1024, 128*1024)) < 0)
                return err;
 
        return 0;
@@ -1358,9 +1485,9 @@ static int __devinit snd_via8233a_pcm_new(via82xx_t *chip)
 /*
  * create a pcm instance for via686a/b
  */
-static int __devinit snd_via686_pcm_new(via82xx_t *chip)
+static int __devinit snd_via686_pcm_new(struct via82xx *chip)
 {
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
        int err;
 
        chip->playback_devno = 0;
@@ -1376,11 +1503,12 @@ static int __devinit snd_via686_pcm_new(via82xx_t *chip)
        pcm->private_data = chip;
        strcpy(pcm->name, chip->card->shortname);
        chip->pcms[0] = pcm;
-       init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0);
-       init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 1);
+       init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0, 0);
+       init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 0, 1);
 
        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                        snd_dma_pci_data(chip->pci), 64*1024, 128*1024)) < 0)
+                                                        snd_dma_pci_data(chip->pci),
+                                                        64*1024, 128*1024)) < 0)
                return err;
 
        return 0;
@@ -1391,7 +1519,8 @@ static int __devinit snd_via686_pcm_new(via82xx_t *chip)
  *  Mixer part
  */
 
-static int snd_via8233_capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_via8233_capture_source_info(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
 {
        /* formerly they were "Line" and "Mic", but it looks like that they
         * have nothing to do with the actual physical connections...
@@ -1408,17 +1537,19 @@ static int snd_via8233_capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_ele
        return 0;
 }
 
-static int snd_via8233_capture_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
        unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
        ucontrol->value.enumerated.item[0] = inb(port) & VIA_REG_CAPTURE_CHANNEL_MIC ? 1 : 0;
        return 0;
 }
 
-static int snd_via8233_capture_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_capture_source_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
        unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
        u8 val, oval;
 
@@ -1433,7 +1564,7 @@ static int snd_via8233_capture_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem
        return val != oval;
 }
 
-static snd_kcontrol_new_t snd_via8233_capture_source __devinitdata = {
+static struct snd_kcontrol_new snd_via8233_capture_source __devinitdata = {
        .name = "Input Source Select",
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .info = snd_via8233_capture_source_info,
@@ -1441,7 +1572,8 @@ static snd_kcontrol_new_t snd_via8233_capture_source __devinitdata = {
        .put = snd_via8233_capture_source_put,
 };
 
-static int snd_via8233_dxs3_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_via8233_dxs3_spdif_info(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
        uinfo->count = 1;
@@ -1450,9 +1582,10 @@ static int snd_via8233_dxs3_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_in
        return 0;
 }
 
-static int snd_via8233_dxs3_spdif_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_dxs3_spdif_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
        u8 val;
 
        pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val);
@@ -1460,9 +1593,10 @@ static int snd_via8233_dxs3_spdif_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
        return 0;
 }
 
-static int snd_via8233_dxs3_spdif_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_dxs3_spdif_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
        u8 val, oval;
 
        pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &oval);
@@ -1478,7 +1612,7 @@ static int snd_via8233_dxs3_spdif_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
        return 0;
 }
 
-static snd_kcontrol_new_t snd_via8233_dxs3_spdif_control __devinitdata = {
+static struct snd_kcontrol_new snd_via8233_dxs3_spdif_control __devinitdata = {
        .name = SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH),
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .info = snd_via8233_dxs3_spdif_info,
@@ -1486,7 +1620,8 @@ static snd_kcontrol_new_t snd_via8233_dxs3_spdif_control __devinitdata = {
        .put = snd_via8233_dxs3_spdif_put,
 };
 
-static int snd_via8233_dxs_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_via8233_dxs_volume_info(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
        uinfo->count = 2;
@@ -1495,17 +1630,53 @@ static int snd_via8233_dxs_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_in
        return 0;
 }
 
-static int snd_via8233_dxs_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_dxs_volume_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
-       ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume[0];
-       ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume[1];
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
+       unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id);
+
+       ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][0];
+       ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][1];
        return 0;
 }
 
-static int snd_via8233_dxs_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_via8233_pcmdxs_volume_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
-       via82xx_t *chip = snd_kcontrol_chip(kcontrol);
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
+       ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[0];
+       ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[1];
+       return 0;
+}
+
+static int snd_via8233_dxs_volume_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
+       unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id);
+       unsigned long port = chip->port + 0x10 * idx;
+       unsigned char val;
+       int i, change = 0;
+
+       for (i = 0; i < 2; i++) {
+               val = ucontrol->value.integer.value[i];
+               if (val > VIA_DXS_MAX_VOLUME)
+                       val = VIA_DXS_MAX_VOLUME;
+               val = VIA_DXS_MAX_VOLUME - val;
+               change |= val != chip->playback_volume[idx][i];
+               if (change) {
+                       chip->playback_volume[idx][i] = val;
+                       outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
+               }
+       }
+       return change;
+}
+
+static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+       struct via82xx *chip = snd_kcontrol_chip(kcontrol);
        unsigned int idx;
        unsigned char val;
        int i, change = 0;
@@ -1515,11 +1686,12 @@ static int snd_via8233_dxs_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
                if (val > VIA_DXS_MAX_VOLUME)
                        val = VIA_DXS_MAX_VOLUME;
                val = VIA_DXS_MAX_VOLUME - val;
-               if (val != chip->playback_volume[i]) {
+               if (val != chip->playback_volume_c[i]) {
                        change = 1;
-                       chip->playback_volume[i] = val;
+                       chip->playback_volume_c[i] = val;
                        for (idx = 0; idx < 4; idx++) {
                                unsigned long port = chip->port + 0x10 * idx;
+                               chip->playback_volume[idx][i] = val;
                                outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
                        }
                }
@@ -1527,26 +1699,43 @@ static int snd_via8233_dxs_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_val
        return change;
 }
 
-static snd_kcontrol_new_t snd_via8233_dxs_volume_control __devinitdata = {
+static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1);
+
+static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {
        .name = "PCM Playback Volume",
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ),
+       .info = snd_via8233_dxs_volume_info,
+       .get = snd_via8233_pcmdxs_volume_get,
+       .put = snd_via8233_pcmdxs_volume_put,
+       .tlv = { .p = db_scale_dxs }
+};
+
+static struct snd_kcontrol_new snd_via8233_dxs_volume_control __devinitdata = {
+       .name = "VIA DXS Playback Volume",
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ),
+       .count = 4,
        .info = snd_via8233_dxs_volume_info,
        .get = snd_via8233_dxs_volume_get,
        .put = snd_via8233_dxs_volume_put,
+       .tlv = { .p = db_scale_dxs }
 };
 
 /*
  */
 
-static void snd_via82xx_mixer_free_ac97_bus(ac97_bus_t *bus)
+static void snd_via82xx_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
 {
-       via82xx_t *chip = bus->private_data;
+       struct via82xx *chip = bus->private_data;
        chip->ac97_bus = NULL;
 }
 
-static void snd_via82xx_mixer_free_ac97(ac97_t *ac97)
+static void snd_via82xx_mixer_free_ac97(struct snd_ac97 *ac97)
 {
-       via82xx_t *chip = ac97->private_data;
+       struct via82xx *chip = ac97->private_data;
        chip->ac97 = NULL;
 }
 
@@ -1600,14 +1789,26 @@ static struct ac97_quirk ac97_quirks[] = {
                .name = "Arima Notebook",
                .type = AC97_TUNE_HP_ONLY,
        },
+       {
+               .subvendor = 0x161f,
+               .subdevice = 0x2032,
+               .name = "Targa Traveller 811",
+               .type = AC97_TUNE_HP_ONLY,
+       },
+       {
+               .subvendor = 0x161f,
+               .subdevice = 0x2032,
+               .name = "m680x",
+               .type = AC97_TUNE_HP_ONLY, /* http://launchpad.net/bugs/38546 */
+       },
        { } /* terminator */
 };
 
-static int __devinit snd_via82xx_mixer_new(via82xx_t *chip, const char *quirk_override)
+static int __devinit snd_via82xx_mixer_new(struct via82xx *chip, const char *quirk_override)
 {
-       ac97_template_t ac97;
+       struct snd_ac97_template ac97;
        int err;
-       static ac97_bus_ops_t ops = {
+       static struct snd_ac97_bus_ops ops = {
                .write = snd_via82xx_codec_write,
                .read = snd_via82xx_codec_read,
                .wait = snd_via82xx_codec_wait,
@@ -1622,7 +1823,7 @@ static int __devinit snd_via82xx_mixer_new(via82xx_t *chip, const char *quirk_ov
        ac97.private_data = chip;
        ac97.private_free = snd_via82xx_mixer_free_ac97;
        ac97.pci = chip->pci;
-       ac97.scaps = AC97_SCAP_SKIP_MODEM;
+       ac97.scaps = AC97_SCAP_SKIP_MODEM | AC97_SCAP_POWER_SAVE;
        if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97)) < 0)
                return err;
 
@@ -1638,7 +1839,7 @@ static int __devinit snd_via82xx_mixer_new(via82xx_t *chip, const char *quirk_ov
 
 #ifdef SUPPORT_JOYSTICK
 #define JOYSTICK_ADDR  0x200
-static int __devinit snd_via686_create_gameport(via82xx_t *chip, unsigned char *legacy)
+static int __devinit snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy)
 {
        struct gameport *gp;
        struct resource *r;
@@ -1648,15 +1849,15 @@ static int __devinit snd_via686_create_gameport(via82xx_t *chip, unsigned char *
 
        r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
        if (!r) {
-               printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n", JOYSTICK_ADDR);
+               printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n",
+                      JOYSTICK_ADDR);
                return -EBUSY;
        }
 
        chip->gameport = gp = gameport_allocate_port();
        if (!gp) {
                printk(KERN_ERR "via82xx: cannot allocate memory for gameport\n");
-               release_resource(r);
-               kfree_nocheck(r);
+               release_and_free_resource(r);
                return -ENOMEM;
        }
 
@@ -1675,23 +1876,22 @@ static int __devinit snd_via686_create_gameport(via82xx_t *chip, unsigned char *
        return 0;
 }
 
-static void snd_via686_free_gameport(via82xx_t *chip)
+static void snd_via686_free_gameport(struct via82xx *chip)
 {
        if (chip->gameport) {
                struct resource *r = gameport_get_port_data(chip->gameport);
 
                gameport_unregister_port(chip->gameport);
                chip->gameport = NULL;
-               release_resource(r);
-               kfree_nocheck(r);
+               release_and_free_resource(r);
        }
 }
 #else
-static inline int snd_via686_create_gameport(via82xx_t *chip, unsigned char *legacy)
+static inline int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy)
 {
        return -ENOSYS;
 }
-static inline void snd_via686_free_gameport(via82xx_t *chip) { }
+static inline void snd_via686_free_gameport(struct via82xx *chip) { }
 #endif
 
 
@@ -1699,7 +1899,7 @@ static inline void snd_via686_free_gameport(via82xx_t *chip) { }
  *
  */
 
-static int __devinit snd_via8233_init_misc(via82xx_t *chip)
+static int __devinit snd_via8233_init_misc(struct via82xx *chip)
 {
        int i, err, caps;
        unsigned char val;
@@ -1720,17 +1920,24 @@ static int __devinit snd_via8233_init_misc(via82xx_t *chip)
                /* when no h/w PCM volume control is found, use DXS volume control
                 * as the PCM vol control
                 */
-               snd_ctl_elem_id_t sid;
+               struct snd_ctl_elem_id sid;
                memset(&sid, 0, sizeof(sid));
                strcpy(sid.name, "PCM Playback Volume");
                sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
                if (! snd_ctl_find_id(chip->card, &sid)) {
+                       snd_printd(KERN_INFO "Using DXS as PCM Playback\n");
+                       err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_pcmdxs_volume_control, chip));
+                       if (err < 0)
+                               return err;
+               }
+               else /* Using DXS when PCM emulation is enabled is really weird */
+               {
+                       /* Standalone DXS controls */
                        err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_dxs_volume_control, chip));
                        if (err < 0)
                                return err;
                }
        }
-
        /* select spdif data slot 10/11 */
        pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val);
        val = (val & ~VIA8233_SPDIF_SLOT_MASK) | VIA8233_SPDIF_SLOT_1011;
@@ -1740,7 +1947,7 @@ static int __devinit snd_via8233_init_misc(via82xx_t *chip)
        return 0;
 }
 
-static int __devinit snd_via686_init_misc(via82xx_t *chip)
+static int __devinit snd_via686_init_misc(struct via82xx *chip)
 {
        unsigned char legacy, legacy_cfg;
        int rev_h = 0;
@@ -1792,7 +1999,7 @@ static int __devinit snd_via686_init_misc(via82xx_t *chip)
        pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, legacy_cfg);
        if (chip->mpu_res) {
                if (snd_mpu401_uart_new(chip->card, 0, MPU401_HW_VIA686A,
-                                       mpu_port, 1,
+                                       mpu_port, MPU401_INFO_INTEGRATED,
                                        chip->irq, 0, &chip->rmidi) < 0) {
                        printk(KERN_WARNING "unable to initialize MPU-401"
                               " at 0x%lx, skipping\n", mpu_port);
@@ -1817,9 +2024,10 @@ static int __devinit snd_via686_init_misc(via82xx_t *chip)
 /*
  * proc interface
  */
-static void snd_via82xx_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
+static void snd_via82xx_proc_read(struct snd_info_entry *entry,
+                                 struct snd_info_buffer *buffer)
 {
-       via82xx_t *chip = entry->private_data;
+       struct via82xx *chip = entry->private_data;
        int i;
        
        snd_iprintf(buffer, "%s\n\n", chip->card->longname);
@@ -1828,19 +2036,19 @@ static void snd_via82xx_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *bu
        }
 }
 
-static void __devinit snd_via82xx_proc_init(via82xx_t *chip)
+static void __devinit snd_via82xx_proc_init(struct via82xx *chip)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 
        if (! snd_card_proc_new(chip->card, "via82xx", &entry))
-               snd_info_set_text_ops(entry, chip, 1024, snd_via82xx_proc_read);
+               snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read);
 }
 
 /*
  *
  */
 
-static int snd_via82xx_chip_init(via82xx_t *chip)
+static int snd_via82xx_chip_init(struct via82xx *chip)
 {
        unsigned int val;
        unsigned long end_time;
@@ -1890,12 +2098,11 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                        break;
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(1);
+               schedule_timeout_uninterruptible(1);
        } while (time_before(jiffies, end_time));
 
        if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
-               snd_printk("AC'97 codec is not ready [0x%x]\n", val);
+               snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val);
 
 #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */
        snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ |
@@ -1910,8 +2117,7 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                        chip->ac97_secondary = 1;
                        goto __ac97_ok2;
                }
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(1);
+               schedule_timeout_interruptible(1);
        } while (time_before(jiffies, end_time));
        /* This is ok, the most of motherboards have only one codec */
 
@@ -1943,8 +2149,11 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
                int i, idx;
                for (idx = 0; idx < 4; idx++) {
                        unsigned long port = chip->port + 0x10 * idx;
-                       for (i = 0; i < 2; i++)
-                               outb(chip->playback_volume[i], port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
+                       for (i = 0; i < 2; i++) {
+                               chip->playback_volume[idx][i]=chip->playback_volume_c[i];
+                               outb(chip->playback_volume_c[i],
+                                    port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
+                       }
                }
        }
 
@@ -1955,14 +2164,15 @@ static int snd_via82xx_chip_init(via82xx_t *chip)
 /*
  * power management
  */
-static int snd_via82xx_suspend(snd_card_t *card, pm_message_t state)
+static int snd_via82xx_suspend(struct pci_dev *pci, pm_message_t state)
 {
-       via82xx_t *chip = card->pm_private_data;
+       struct snd_card *card = pci_get_drvdata(pci);
+       struct via82xx *chip = card->private_data;
        int i;
 
+       snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
        for (i = 0; i < 2; i++)
-               if (chip->pcms[i])
-                       snd_pcm_suspend_all(chip->pcms[i]);
+               snd_pcm_suspend_all(chip->pcms[i]);
        for (i = 0; i < chip->num_devs; i++)
                snd_via82xx_channel_reset(chip, &chip->devs[i]);
        synchronize_irq(chip->irq);
@@ -1975,18 +2185,27 @@ static int snd_via82xx_suspend(snd_card_t *card, pm_message_t state)
                chip->capture_src_saved[1] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10);
        }
 
-       pci_set_power_state(chip->pci, 3);
-       pci_disable_device(chip->pci);
+       pci_disable_device(pci);
+       pci_save_state(pci);
+       pci_set_power_state(pci, pci_choose_state(pci, state));
        return 0;
 }
 
-static int snd_via82xx_resume(snd_card_t *card)
+static int snd_via82xx_resume(struct pci_dev *pci)
 {
-       via82xx_t *chip = card->pm_private_data;
+       struct snd_card *card = pci_get_drvdata(pci);
+       struct via82xx *chip = card->private_data;
        int i;
 
-       pci_enable_device(chip->pci);
-       pci_set_power_state(chip->pci, 0);
+       pci_set_power_state(pci, PCI_D0);
+       pci_restore_state(pci);
+       if (pci_enable_device(pci) < 0) {
+               printk(KERN_ERR "via82xx: pci_enable_device failed, "
+                      "disabling device\n");
+               snd_card_disconnect(card);
+               return -EIO;
+       }
+       pci_set_master(pci);
 
        snd_via82xx_chip_init(chip);
 
@@ -2006,11 +2225,12 @@ static int snd_via82xx_resume(snd_card_t *card)
        for (i = 0; i < chip->num_devs; i++)
                snd_via82xx_channel_reset(chip, &chip->devs[i]);
 
+       snd_power_change_state(card, SNDRV_CTL_POWER_D0);
        return 0;
 }
 #endif /* CONFIG_PM */
 
-static int snd_via82xx_free(via82xx_t *chip)
+static int snd_via82xx_free(struct via82xx *chip)
 {
        unsigned int i;
 
@@ -2022,11 +2242,8 @@ static int snd_via82xx_free(via82xx_t *chip)
        synchronize_irq(chip->irq);
       __end_hw:
        if (chip->irq >= 0)
-               free_irq(chip->irq, (void *)chip);
-       if (chip->mpu_res) {
-               release_resource(chip->mpu_res);
-               kfree_nocheck(chip->mpu_res);
-       }
+               free_irq(chip->irq, chip);
+       release_and_free_resource(chip->mpu_res);
        pci_release_regions(chip->pci);
 
        if (chip->chip_type == TYPE_VIA686) {
@@ -2039,22 +2256,22 @@ static int snd_via82xx_free(via82xx_t *chip)
        return 0;
 }
 
-static int snd_via82xx_dev_free(snd_device_t *device)
+static int snd_via82xx_dev_free(struct snd_device *device)
 {
-       via82xx_t *chip = device->device_data;
+       struct via82xx *chip = device->device_data;
        return snd_via82xx_free(chip);
 }
 
-static int __devinit snd_via82xx_create(snd_card_t * card,
+static int __devinit snd_via82xx_create(struct snd_card *card,
                                        struct pci_dev *pci,
                                        int chip_type,
                                        int revision,
                                        unsigned int ac97_clock,
-                                       via82xx_t ** r_via)
+                                       struct via82xx ** r_via)
 {
-       via82xx_t *chip;
+       struct via82xx *chip;
        int err;
-        static snd_device_ops_t ops = {
+        static struct snd_device_ops ops = {
                .dev_free =     snd_via82xx_dev_free,
         };
 
@@ -2087,9 +2304,12 @@ static int __devinit snd_via82xx_create(snd_card_t * card,
                return err;
        }
        chip->port = pci_resource_start(pci, 0);
-       if (request_irq(pci->irq, snd_via82xx_interrupt, SA_INTERRUPT|SA_SHIRQ,
-                       card->driver, (void *)chip)) {
-               snd_printk("unable to grab IRQ %d\n", pci->irq);
+       if (request_irq(pci->irq,
+                       chip_type == TYPE_VIA8233 ?
+                       snd_via8233_interrupt : snd_via686_interrupt,
+                       IRQF_SHARED,
+                       card->driver, chip)) {
+               snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_via82xx_free(chip);
                return -EBUSY;
        }
@@ -2131,86 +2351,71 @@ static struct via823x_info via823x_cards[] __devinitdata = {
        { VIA_REV_8233A, "VIA 8233A", TYPE_VIA8233A },
        { VIA_REV_8235, "VIA 8235", TYPE_VIA8233 },
        { VIA_REV_8237, "VIA 8237", TYPE_VIA8233 },
+       { VIA_REV_8251, "VIA 8251", TYPE_VIA8233 },
 };
 
 /*
  * auto detection of DXS channel supports.
  */
-struct dxs_whitelist {
-       unsigned short subvendor;
-       unsigned short subdevice; 
-       unsigned short mask; 
-       short action;   /* new dxs_support value */
-};
 
-static int __devinit check_dxs_list(struct pci_dev *pci)
-{
-       static struct dxs_whitelist whitelist[] = {
-               { .subvendor = 0x1005, .subdevice = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */
-               { .subvendor = 0x1019, .subdevice = 0x0996, .action = VIA_DXS_48K },
-               { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
-               { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
-               { .subvendor = 0x1019, .subdevice = 0xa101, .action = VIA_DXS_SRC },
-               { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
-               { .subvendor = 0x1025, .subdevice = 0x0046, .action = VIA_DXS_SRC }, /* Acer Aspire 1524 WLMi */
-               { .subvendor = 0x1043, .subdevice = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
-               { .subvendor = 0x1043, .subdevice = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
-               { .subvendor = 0x1043, .subdevice = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 
-               { .subvendor = 0x1043, .subdevice = 0x810d, .action = VIA_DXS_SRC }, /* ASUS */
-               { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC    }, /* ASUS A8V Deluxe */ 
-               { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
-               { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */
-               { .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
-               { .subvendor = 0x1106, .subdevice = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
-               { .subvendor = 0x1106, .subdevice = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */
-               { .subvendor = 0x1106, .subdevice = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */
-               { .subvendor = 0x1106, .subdevice = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */
-               { .subvendor = 0x1297, .subdevice = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */
-               { .subvendor = 0x1297, .subdevice = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */
-               { .subvendor = 0x1458, .subdevice = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */
-               { .subvendor = 0x1462, .subdevice = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */
-               { .subvendor = 0x1462, .subdevice = 0x0430, .action = VIA_DXS_SRC }, /* MSI 7142 (K8MM-V) */
-               { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
-               { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
-               { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
-               { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
-               { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */
-               { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
-               { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
-               { .subvendor = 0x147b, .subdevice = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */
-               { .subvendor = 0x147b, .subdevice = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */
-               { .subvendor = 0x14ff, .subdevice = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */
-               { .subvendor = 0x14ff, .subdevice = 0x0408, .action = VIA_DXS_SRC }, /* Twinhead laptop */
-               { .subvendor = 0x1584, .subdevice = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */
-               { .subvendor = 0x1584, .subdevice = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */
-               { .subvendor = 0x161f, .subdevice = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */
-               { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
-               { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
-               { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
-               { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
-               { .subvendor = 0x1919, .subdevice = 0x200a, .action = VIA_DXS_NO_VRA }, /* Soltek SL-K8Tpro-939 */
-               { .subvendor = 0x4005, .subdevice = 0x4710, .action = VIA_DXS_SRC },    /* MSI K7T266 Pro2 (MS-6380 V2.0) BIOS 3.7 */
-               { } /* terminator */
-       };
-       struct dxs_whitelist *w;
-       unsigned short subsystem_vendor;
-       unsigned short subsystem_device;
+static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
+       SND_PCI_QUIRK(0x1005, 0x4710, "Avance Logic Mobo", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1019, 0x0996, "ESC Mobo", VIA_DXS_48K),
+       SND_PCI_QUIRK(0x1019, 0x0a81, "ECS K7VTA3 v8.0", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x1019, 0x0a85, "ECS L7VMM2", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x1019, 0, "ESC K8", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1019, 0xaa01, "ESC K8T890-A", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1025, 0x0033, "Acer Inspire 1353LM", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x1025, 0x0046, "Acer Aspire 1524 WLMi", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1043, 0, "ASUS A7/A8", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x1071, 0, "Diverse Notebook", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x10cf, 0x118e, "FSC Laptop", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1106, 0, "ASRock", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1297, 0xa232, "Shuttle", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1297, 0xc160, "Shuttle Sk41G", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte GA-7VAXP", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1462, 0x3800, "MSI KT266", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1462, 0x7120, "MSI KT4V", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1462, 0x7142, "MSI K8MM-V", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1462, 0, "MSI Mobo", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x147b, 0x1401, "ABIT KD7(-RAID)", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x147b, 0x1411, "ABIT VA-20", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x147b, 0x1413, "ABIT KV8 Pro", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x147b, 0x1415, "ABIT AV8", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x14ff, 0x0403, "Twinhead mobo", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x14ff, 0x0408, "Twinhead laptop", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1558, 0x4701, "Clevo D470", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1584, 0x8120, "Diverse Laptop", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1584, 0x8123, "Targa/Uniwill", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x161f, 0x202b, "Amira Notebook", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x161f, 0x2032, "m680x machines", VIA_DXS_48K),
+       SND_PCI_QUIRK(0x1631, 0xe004, "PB EasyNote 3174", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1695, 0x3005, "EPoX EP-8K9A", VIA_DXS_ENABLE),
+       SND_PCI_QUIRK(0x1695, 0, "EPoX mobo", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x16f3, 0, "Jetway K8", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1734, 0, "FSC Laptop", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1849, 0x3059, "ASRock K7VM2", VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x1849, 0, "ASRock mobo", VIA_DXS_SRC),
+       SND_PCI_QUIRK(0x1919, 0x200a, "Soltek SL-K8",  VIA_DXS_NO_VRA),
+       SND_PCI_QUIRK(0x4005, 0x4710, "MSI K7T266", VIA_DXS_SRC),
+       { } /* terminator */
+};
 
-       pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
-       pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
+static int __devinit check_dxs_list(struct pci_dev *pci, int revision)
+{
+       const struct snd_pci_quirk *w;
 
-       for (w = whitelist; w->subvendor; w++) {
-               if (w->subvendor != subsystem_vendor)
-                       continue;
-               if (w->mask) {
-                       if ((w->mask & subsystem_device) == w->subdevice)
-                               return w->action;
-               } else {
-                       if (subsystem_device == w->subdevice)
-                               return w->action;
-               }
+       w = snd_pci_quirk_lookup(pci, dxs_whitelist);
+       if (w) {
+               snd_printdd(KERN_INFO "via82xx: DXS white list for %s found\n",
+                           w->name);
+               return w->value;
        }
 
+       /* for newer revision, default to DXS_SRC */
+       if (revision >= VIA_REV_8235)
+               return VIA_DXS_SRC;
+
        /*
         * not detected, try 48k rate only to be sure.
         */
@@ -2224,8 +2429,8 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
 static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                                       const struct pci_device_id *pci_id)
 {
-       snd_card_t *card;
-       via82xx_t *chip;
+       struct snd_card *card;
+       struct via82xx *chip;
        unsigned char revision;
        int chip_type = 0, card_type;
        unsigned int i;
@@ -2255,7 +2460,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                }
                if (chip_type != TYPE_VIA8233A) {
                        if (dxs_support == VIA_DXS_AUTO)
-                               dxs_support = check_dxs_list(pci);
+                               dxs_support = check_dxs_list(pci, revision);
                        /* force to use VIA8233 or 8233A model according to
                         * dxs_support module option
                         */
@@ -2280,6 +2485,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
        if ((err = snd_via82xx_create(card, pci, chip_type, revision,
                                      ac97_clock, &chip)) < 0)
                goto __error;
+       card->private_data = chip;
        if ((err = snd_via82xx_mixer_new(chip, ac97_quirk)) < 0)
                goto __error;
 
@@ -2308,8 +2514,6 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                        goto __error;
        }
 
-       snd_card_set_pm_callback(card, snd_via82xx_suspend, snd_via82xx_resume, chip);
-
        /* disable interrupts */
        for (i = 0; i < chip->num_devs; i++)
                snd_via82xx_channel_reset(chip, &chip->devs[i]);
@@ -2340,11 +2544,13 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
        .name = "VIA 82xx Audio",
-       .owner = THIS_MODULE,
        .id_table = snd_via82xx_ids,
        .probe = snd_via82xx_probe,
        .remove = __devexit_p(snd_via82xx_remove),
-       SND_PCI_PM_CALLBACKS
+#ifdef CONFIG_PM
+       .suspend = snd_via82xx_suspend,
+       .resume = snd_via82xx_resume,
+#endif
 };
 
 static int __init alsa_card_via82xx_init(void)