Changeset 679 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/intel8x0.c (modified) (108 diffs)

GPL/trunk/alsa-kernel/pci/intel8x0.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *   ALSA driver for Intel ICH (i8x0) chipsets
@@ -4 +5 @@
  *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
- *
  *   This code also contains alpha support for SiS 735 chipsets provided
  *   by Mike Pieper <mptei@users.sourceforge.net>. We have no datasheet
  *   for SiS735, so the code is not fully functional.
  *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
- *
- */
-
-#include <asm/io.h>
+ */      
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "intel8x0"
+#endif
+
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -33 +21 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -39 +27 @@
 #include <sound/info.h>
 #include <sound/initval.h>
-/* for 440MX workaround */
-#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -74 +59 @@
 static int ac97_clock;
 static char *ac97_quirk;
-static int buggy_semaphore;
+static bool buggy_semaphore;
 static int buggy_irq = -1; /* auto-check */
-static int xbox;
+static bool xbox;
 static int spdif_aclink = -1;
+static int inside_vm = -1;
 
 module_param(index, int, 0444);
@@ -84 +70 @@
 MODULE_PARM_DESC(id, "ID string for Intel i8x0 soundcard.");
 module_param(ac97_clock, int, 0444);
-MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = whitelist + auto-detect, 1 = force autodetect).");
+MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = allowlist + auto-detect, 1 = force autodetect).");
 module_param(ac97_quirk, charp, 0444);
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
 module_param(buggy_semaphore, bool, 0444);
 MODULE_PARM_DESC(buggy_semaphore, "Enable workaround for hardwares with problematic codec semaphores.");
-module_param(buggy_irq, bool, 0444);
+module_param(buggy_irq, bint, 0444);
 MODULE_PARM_DESC(buggy_irq, "Enable workaround for buggy interrupts on some motherboards.");
 module_param(xbox, bool, 0444);
@@ -95 +81 @@
 module_param(spdif_aclink, int, 0444);
 MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");
+module_param(inside_vm, bint, 0444);
+MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization.");
 
 /* just for backward compatibility */
-//static int enable;
+//static bool enable;
 module_param(enable, bool, 0444);
 //static int joystick;
@@ -269 +257 @@
 
 /* interrupts for the whole chip by interrupt status register finish */
-
+ 
 #define ALI_INT_MICIN2          (1<<26)
 #define ALI_INT_PCMIN2          (1<<25)
@@ -313 +301 @@
 
 /*
- *
+ *  
  */
 
@@ -347 +335 @@
         unsigned int ichd;                      /* ich device number */
         unsigned long reg_offset;               /* offset to bmaddr */
-        u32 *bdbar;                             /* CPU address (32bit) */
+        __le32 *bdbar;                          /* CPU address (32bit) */
         unsigned int bdbar_addr;                /* PCI bus address (32bit) */
         struct snd_pcm_substream *substream;
@@ -370 +358 @@
         struct ac97_pcm *pcm;
         int pcm_open_flag;
-        unsigned int page_attr_changed: 1;
         unsigned int suspended: 1;
 };
@@ -401 +388 @@
         unsigned xbox: 1;               /* workaround for Xbox AC'97 detection */
         unsigned buggy_semaphore: 1;    /* workaround for buggy codec semaphore */
+        unsigned inside_vm: 1;          /* enable VM optimization */
 
         int spdif_idx;  /* SPDIF BAR index; *_SPBAR or -1 if use PCMOUT */
@@ -409 +397 @@
         unsigned int ac97_sdin[3];
         unsigned int max_codecs, ncodecs;
-        unsigned int *codec_bit;
+        const unsigned int *codec_bit;
         unsigned int codec_isr_bits;
         unsigned int codec_ready_bits;
@@ -421 +409 @@
 };
 
-static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = {
+static const struct pci_device_id snd_intel8x0_ids[] = {
         { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL },   /* 82801AA */
         { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL },   /* 82901AB */
@@ -535 +523 @@
         } while (time--);
 
-        /* access to some forbidden (non existant) ac97 registers will not
+        /* access to some forbidden (non existent) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
-        snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
+        dev_err(chip->card->dev,
+                "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
                         igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));
         iagetword(chip, 0);     /* clear semaphore flag */
@@ -553 +542 @@
         if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        dev_err(chip->card->dev,
+                                "codec_write %d: semaphore is not ready for register 0x%x\n",
+                                ac97->num, reg);
         }
         iaputword(chip, reg + ac97->num * 0x80, val);
@@ -567 +558 @@
         if (snd_intel8x0_codec_semaphore(chip, ac97->num) < 0) {
                 if (! chip->in_ac97_init)
-                        snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97->num, reg);
+                        dev_err(chip->card->dev,
+                                "codec_read %d: semaphore is not ready for register 0x%x\n",
+                                ac97->num, reg);
                 res = 0xffff;
         } else {
@@ -576 +569 @@
                                   ~(chip->codec_ready_bits | ICH_GSCI));
                         if (! chip->in_ac97_init)
-                                snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
+                                dev_err(chip->card->dev,
+                                        "codec_read %d: read timeout for register 0x%x\n",
+                                        ac97->num, reg);
                         res = 0xffff;
                 }
@@ -583 +578 @@
 }
 
-static void __devinit snd_intel8x0_codec_read_test(struct intel8x0 *chip,
-                                                   unsigned int codec)
+static void snd_intel8x0_codec_read_test(struct intel8x0 *chip,
+                                         unsigned int codec)
 {
         unsigned int tmp;
@@ -610 +605 @@
         }
         if (! chip->in_ac97_init)
-                snd_printd(KERN_WARNING "intel8x0: AC97 codec ready timeout.\n");
+                dev_warn(chip->card->dev, "AC97 codec ready timeout.\n");
         return -EBUSY;
 }
@@ -622 +617 @@
                 udelay(1);
         if (! time && ! chip->in_ac97_init)
-                snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");
+                dev_warn(chip->card->dev, "ali_codec_semaphore timeout\n");
         return snd_intel8x0_ali_codec_ready(chip, ALI_CSPSR_CODEC_READY);
 }
@@ -662 +657 @@
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev)
+static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev) 
 {
         int idx;
-        u32 *bdbar = ichdev->bdbar;
+        __le32 *bdbar = ichdev->bdbar;
         unsigned long port = ichdev->reg_offset;
 
@@ -691 +686 @@
                                                      ichdev->fragsize >> ichdev->pos_shift);
 #if 0
-                        printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
+                        dev_dbg(chip->card->dev, "bdbar[%i] = 0x%x [0x%x]\n",
                                idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
 #endif
@@ -703 +698 @@
         ichdev->position = 0;
 #if 0
-        printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
-               "period_size1 = 0x%x\n",
+        dev_dbg(chip->card->dev,
+                "lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
                ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
                ichdev->fragsize1);
@@ -711 +706 @@
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
 }
-
-#ifdef __i386__
-/*
- * Intel 82443MX running a 100MHz processor system bus has a hardware bug,
- * which aborts PCI busmaster for audio transfer.  A workaround is to set
- * the pages as non-cached.  For details, see the errata in
- *      http://download.intel.com/design/chipsets/specupdt/24505108.pdf
- */
-static void fill_nocache(void *buf, int size, int nocache)
-{
-        size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        if (nocache)
-                set_pages_uc(virt_to_page(buf), size);
-        else
-                set_pages_wb(virt_to_page(buf), size);
-}
-#else
-#define fill_nocache(buf, size, nocache) do { ; } while (0)
-#endif
 
 /*
@@ -772 +748 @@
                 ichdev->bdbar[ichdev->lvi * 2] = cpu_to_le32(ichdev->physbuf + ichdev->lvi_frag * ichdev->fragsize1);
 #if 0
-        printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, "
-               "all = 0x%x, 0x%x\n",
+        dev_dbg(chip->card->dev,
+                "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
                ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
                ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
@@ -838 +814 @@
         case SNDRV_PCM_TRIGGER_RESUME:
                 ichdev->suspended = 0;
-                /* fallthru */
+                fallthrough;
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@@ -846 +822 @@
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 ichdev->suspended = 1;
-                /* fallthru */
+                fallthrough;
         case SNDRV_PCM_TRIGGER_STOP:
                 val = 0;
@@ -871 +847 @@
         struct ichdev *ichdev = get_ichdev(substream);
         unsigned long port = ichdev->reg_offset;
-        static int fiforeg[] = {
+        static const int fiforeg[] = {
                 ICHREG(ALI_FIFOCR1), ICHREG(ALI_FIFOCR2), ICHREG(ALI_FIFOCR3)
         };
@@ -880 +856 @@
         case SNDRV_PCM_TRIGGER_RESUME:
                 ichdev->suspended = 0;
-                /* fallthru */
+                fallthrough;
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@@ -886 +862 @@
                         /* clear FIFO for synchronization of channels */
                         fifo = igetdword(chip, fiforeg[ichdev->ali_slot / 4]);
-                        fifo &= ~(0xff << (ichdev->ali_slot % 4));
-                        fifo |= 0x83 << (ichdev->ali_slot % 4);
+                        fifo &= ~(0xff << (ichdev->ali_slot % 4));  
+                        fifo |= 0x83 << (ichdev->ali_slot % 4); 
                         iputdword(chip, fiforeg[ichdev->ali_slot / 4], fifo);
                 }
@@ -897 +873 @@
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 ichdev->suspended = 1;
-                /* fallthru */
+                fallthrough;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
@@ -926 +902 @@
         struct intel8x0 *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
         int dbl = params_rate(hw_params) > 48000;
         int err;
 
-        if (chip->fix_nocache && ichdev->page_attr_changed) {
-                fill_nocache(runtime->dma_area, runtime->dma_bytes, 0); /* clear */
-                ichdev->page_attr_changed = 0;
-        }
-        err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-        if (err < 0)
-                return err;
-        if (chip->fix_nocache) {
-                if (runtime->dma_area && ! ichdev->page_attr_changed) {
-                        fill_nocache(runtime->dma_area, runtime->dma_bytes, 1);
-                        ichdev->page_attr_changed = 1;
-                }
-        }
         if (ichdev->pcm_open_flag) {
                 snd_ac97_pcm_close(ichdev->pcm);
@@ -962 +924 @@
 static int snd_intel8x0_hw_free(struct snd_pcm_substream *substream)
 {
-        struct intel8x0 *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
 
@@ -969 +930 @@
                 ichdev->pcm_open_flag = 0;
         }
-        if (chip->fix_nocache && ichdev->page_attr_changed) {
-                fill_nocache(substream->runtime->dma_area, substream->runtime->dma_bytes, 0);
-                ichdev->page_attr_changed = 0;
-        }
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -1066 +1023 @@
                         continue;
                 }
-                if (civ == igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV) &&
-                    ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
+                if (civ != igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV))
+                        continue;
+
+                /* IO read operation is very expensive inside virtual machine
+                 * as it is emulated. The probability that subsequent PICB read
+                 * will return different result is high enough to loop till
+                 * timeout here.
+                 * Same CIV is strict enough condition to be sure that PICB
+                 * is valid inside VM on emulated card. */
+                if (chip->inside_vm)
+                        break;
+                if (ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
                         break;
         } while (timeout--);
@@ -1093 +1060 @@
 }
 
-static struct snd_pcm_hardware snd_intel8x0_stream =
+static const struct snd_pcm_hardware snd_intel8x0_stream =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1114 +1081 @@
 };
 
-static unsigned int channels4[] = {
+static const unsigned int channels4[] = {
         2, 4,
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_channels4 = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels4 = {
         .count = ARRAY_SIZE(channels4),
         .list = channels4,
@@ -1124 +1091 @@
 };
 
-static unsigned int channels6[] = {
+static const unsigned int channels6[] = {
         2, 4, 6,
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_channels6 = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels6 = {
         .count = ARRAY_SIZE(channels6),
         .list = channels6,
@@ -1134 +1101 @@
 };
 
-static unsigned int channels8[] = {
+static const unsigned int channels8[] = {
         2, 4, 6, 8,
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_channels8 = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels8 = {
         .count = ARRAY_SIZE(channels8),
         .list = channels8,
@@ -1345 +1312 @@
 #endif
 
-static struct snd_pcm_ops snd_intel8x0_playback_ops = {
+static const struct snd_pcm_ops snd_intel8x0_playback_ops = {
         .open =         snd_intel8x0_playback_open,
         .close =        snd_intel8x0_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1356 +1322 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_capture_ops = {
+static const struct snd_pcm_ops snd_intel8x0_capture_ops = {
         .open =         snd_intel8x0_capture_open,
         .close =        snd_intel8x0_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1367 +1332 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {
+static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {
         .open =         snd_intel8x0_mic_open,
         .close =        snd_intel8x0_mic_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1378 +1342 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {
+static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {
         .open =         snd_intel8x0_mic2_open,
         .close =        snd_intel8x0_mic2_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1389 +1352 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_capture2_ops = {
+static const struct snd_pcm_ops snd_intel8x0_capture2_ops = {
         .open =         snd_intel8x0_capture2_open,
         .close =        snd_intel8x0_capture2_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1400 +1362 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_spdif_ops = {
+static const struct snd_pcm_ops snd_intel8x0_spdif_ops = {
         .open =         snd_intel8x0_spdif_open,
         .close =        snd_intel8x0_spdif_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1411 +1372 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {
+static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {
         .open =         snd_intel8x0_playback_open,
         .close =        snd_intel8x0_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1422 +1382 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {
+static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {
         .open =         snd_intel8x0_capture_open,
         .close =        snd_intel8x0_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1433 +1392 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {
+static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {
         .open =         snd_intel8x0_mic_open,
         .close =        snd_intel8x0_mic_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1444 +1402 @@
 };
 
-static struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {
+static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {
         .open =         snd_intel8x0_ali_ac97spdifout_open,
         .close =        snd_intel8x0_ali_ac97spdifout_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1459 +1416 @@
         .open =         snd_intel8x0_ali_spdifin_open,
         .close =        snd_intel8x0_ali_spdifin_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1470 +1426 @@
         .open =         snd_intel8x0_ali_spdifout_open,
         .close =        snd_intel8x0_ali_spdifout_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
@@ -1481 +1436 @@
 struct ich_pcm_table {
         char *suffix;
-        struct snd_pcm_ops *playback_ops;
-        struct snd_pcm_ops *capture_ops;
+        const struct snd_pcm_ops *playback_ops;
+        const struct snd_pcm_ops *capture_ops;
         size_t prealloc_size;
         size_t prealloc_max_size;
@@ -1488 +1443 @@
 };
 
-static int __devinit snd_intel8x0_pcm1(struct intel8x0 *chip, int device,
-                                       struct ich_pcm_table *rec)
+#define intel8x0_dma_type(chip) \
+        ((chip)->fix_nocache ? SNDRV_DMA_TYPE_DEV_UC : SNDRV_DMA_TYPE_DEV)
+
+static int snd_intel8x0_pcm1(struct intel8x0 *chip, int device,
+                             const struct ich_pcm_table *rec)
 {
         struct snd_pcm *pcm;
@@ -1518 +1476 @@
         chip->pcm[device] = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(chip->pci),
-                                              rec->prealloc_size, rec->prealloc_max_size);
+        snd_pcm_set_managed_buffer_all(pcm, intel8x0_dma_type(chip),
+                                       &chip->pci->dev,
+                                       rec->prealloc_size, rec->prealloc_max_size);
+
+        if (rec->playback_ops &&
+            rec->playback_ops->open == snd_intel8x0_playback_open) {
+                struct snd_pcm_chmap *chmap;
+                int chs = 2;
+                if (chip->multi8)
+                        chs = 8;
+                else if (chip->multi6)
+                        chs = 6;
+                else if (chip->multi4)
+                        chs = 4;
+                err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                                             snd_pcm_alt_chmaps, chs, 0,
+                                             &chmap);
+                if (err < 0)
+                        return err;
+                chmap->channel_mask = SND_PCM_CHMAP_MASK_2468;
+                chip->ac97[0]->chmaps[SNDRV_PCM_STREAM_PLAYBACK] = chmap;
+        }
 
         return 0;
 }
 
-static struct ich_pcm_table intel_pcms[] __devinitdata = {
+static const struct ich_pcm_table intel_pcms[] = {
         {
                 .playback_ops = &snd_intel8x0_playback_ops,
@@ -1562 +1539 @@
 };
 
-static struct ich_pcm_table nforce_pcms[] __devinitdata = {
+static const struct ich_pcm_table nforce_pcms[] = {
         {
                 .playback_ops = &snd_intel8x0_playback_ops,
@@ -1585 +1562 @@
 };
 
-static struct ich_pcm_table ali_pcms[] __devinitdata = {
+static const struct ich_pcm_table ali_pcms[] = {
         {
                 .playback_ops = &snd_intel8x0_ali_playback_ops,
@@ -1617 +1594 @@
 };
 
-static int __devinit snd_intel8x0_pcm(struct intel8x0 *chip)
+static int snd_intel8x0_pcm(struct intel8x0 *chip)
 {
         int i, tblsize, device, err;
-        struct ich_pcm_table *tbl, *rec;
+        const struct ich_pcm_table *tbl, *rec;
 
         switch (chip->device_type) {
@@ -1680 +1657 @@
 }
 
-static struct ac97_pcm ac97_pcm_defs[] __devinitdata = {
+static const struct ac97_pcm ac97_pcm_defs[] = {
         /* front PCM */
         {
                 .exclusive = 1,
-                .r =
-                 {      
-                        {
+                .r = {  {
                                 .slots = (1 << AC97_SLOT_PCM_LEFT) |
                                          (1 << AC97_SLOT_PCM_RIGHT) |
@@ -1752 +1727 @@
 };
 
-static struct ac97_quirk ac97_quirks[] __devinitdata = {
-    {
+static const struct ac97_quirk ac97_quirks[] = {
+        {
                 .subvendor = 0x0e11,
                 .subdevice = 0x000e,
                 .name = "Compaq Deskpro EN",    /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
-    },
+        },
         {
                 .subvendor = 0x0e11,
@@ -1771 +1746 @@
                 .type = AC97_TUNE_HP_ONLY
         },
-    {
+        {
                 .subvendor = 0x0e11,
                 .subdevice = 0x0860,
                 .name = "HP/Compaq nx7010",
                 .type = AC97_TUNE_MUTE_LED
-    },
+        },
         {
                 .subvendor = 0x1014,
@@ -1884 +1859 @@
                 .name = "Dell Inspiron 6000",
                 .type = AC97_TUNE_HP_MUTE_LED /* cf. Malone #41015 */
+        },
+        {
+                .subvendor = 0x1028,
+                .subdevice = 0x0189,
+                .name = "Dell Inspiron 9300",
+                .type = AC97_TUNE_HP_MUTE_LED
         },
         {
@@ -2079 +2060 @@
         {
                 .subvendor = 0x161f,
+                .subdevice = 0x202f,
+                .name = "Gateway M520",
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x161f,
                 .subdevice = 0x203a,
                 .name = "Gateway 4525GZ",               /* AD1981B */
@@ -2087 +2074 @@
                 .subdevice = 0x0088,
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */
-                .type = AC97_TUNE_HP_ONLY
-        },
-        {
-                .subvendor = 0x107B,
-                .subdevice = 0x0111,
-                .name = "Gateway 2000 ICH2/AD1885",
                 .type = AC97_TUNE_HP_ONLY
         },
@@ -2153 +2134 @@
 };
 
-static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-                                        const char *quirk_override)
+static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
+                              const char *quirk_override)
 {
         struct snd_ac97_bus *pbus;
@@ -2161 +2142 @@
         unsigned int i, codecs;
         unsigned int glob_sta = 0;
-        struct snd_ac97_bus_ops *ops;
-        static struct snd_ac97_bus_ops standard_bus_ops = {
+        const struct snd_ac97_bus_ops *ops;
+        static const struct snd_ac97_bus_ops standard_bus_ops = {
                 .write = snd_intel8x0_codec_write,
                 .read = snd_intel8x0_codec_read,
         };
-        static struct snd_ac97_bus_ops ali_bus_ops = {
+        static const struct snd_ac97_bus_ops ali_bus_ops = {
                 .write = snd_intel8x0_ali_codec_write,
                 .read = snd_intel8x0_ali_codec_read,
@@ -2183 +2164 @@
                         chip->spdif_idx = ICHD_SPBAR;
                         break;
-                };
+                }
         }
 
@@ -2247 +2228 @@
                 if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0) {
                         if (err != -EACCES)
-                                snd_printk(KERN_ERR "Unable to initialize codec #%d\n", i);
+                                dev_err(chip->card->dev,
+                                        "Unable to initialize codec #%d\n", i);
                         if (i == 0)
                                 goto __err;
@@ -2350 +2332 @@
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-static struct snd_pci_quirk ich_chip_reset_mode[] = {
+static const struct snd_pci_quirk ich_chip_reset_mode[] = {
         SND_PCI_QUIRK(0x1014, 0x051f, "Thinkpad R32", 1),
-        { } /* end */
+        {0} /* end */
 };
 
@@ -2399 +2381 @@
                 schedule_timeout_uninterruptible(1);
         } while (time_after_eq(end_time, jiffies));
-        snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n",
+        dev_err(chip->card->dev, "AC'97 warm reset still in progress? [0x%x]\n",
                    igetdword(chip, ICHREG(GLOB_CNT)));
         return -EIO;
@@ -2443 +2425 @@
                 if (! status) {
                         /* no codec is found */
-                        snd_printk(KERN_ERR "codec_ready: codec is not ready [0x%x]\n",
+                        dev_err(chip->card->dev,
+                                "codec_ready: codec is not ready [0x%x]\n",
                                    igetdword(chip, ICHREG(GLOB_STA)));
                         return -EIO;
@@ -2507 +2490 @@
                 schedule_timeout_uninterruptible(1);
         }
-        snd_printk(KERN_ERR "AC'97 reset failed.\n");
+        dev_err(chip->card->dev, "AC'97 reset failed.\n");
         if (probing)
                 return -EIO;
@@ -2551 +2534 @@
                 }
                 if (timeout == 0)
-                        printk(KERN_ERR "intel8x0: reset of registers failed?\n");
+                        dev_err(chip->card->dev, "reset of registers failed?\n");
         }
         /* initialize Buffer Descriptor Lists */
@@ -2584 +2567 @@
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        if (chip->bdbars.area) {
-                if (chip->fix_nocache)
-                        fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 0);
+        if (chip->bdbars.area)
                 snd_dma_free_pages(&chip->bdbars);
-        }
         if (chip->addr)
                 pci_iounmap(chip->pci, chip->addr);
@@ -2599 +2579 @@
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /*
  * power management
  */
-static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int intel8x0_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct intel8x0 *chip = card->private_data;
         int i;
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        for (i = 0; i < chip->pcm_devs; i++)
-                snd_pcm_suspend_all(chip->pcm[i]);
-        /* clear nocache */
-        if (chip->fix_nocache) {
-                for (i = 0; i < chip->bdbars_count; i++) {
-                        struct ichdev *ichdev = &chip->ichd[i];
-                        if (ichdev->substream && ichdev->page_attr_changed) {
-                                struct snd_pcm_runtime *runtime = ichdev->substream->runtime;
-                                if (runtime->dma_area)
-                                        fill_nocache(runtime->dma_area, runtime->dma_bytes, 0);
-                        }
-                }
-        }
         for (i = 0; i < chip->ncodecs; i++)
                 snd_ac97_suspend(chip->ac97[i]);
@@ -2631 +2598 @@
                 free_irq(chip->irq, chip);
                 chip->irq = -1;
-        }
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        /* The call below may disable built-in speaker on some laptops
-         * after S2RAM.  So, don't touch it.
-         */
-        /* pci_set_power_state(pci, pci_choose_state(pci, state)); */
+                card->sync_irq = -1;
+        }
         return 0;
 }
 
-static int intel8x0_resume(struct pci_dev *pci)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int intel8x0_resume(struct device *dev)
+{
+        struct pci_dev *pci = to_pci_dev(dev);
+        struct snd_card *card = dev_get_drvdata(dev);
         struct intel8x0 *chip = card->private_data;
         int i;
 
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "intel8x0: pci_enable_device failed, "
-                       "disabling device\n");
+        snd_intel8x0_chip_init(chip, 0);
+        if (request_irq(pci->irq, snd_intel8x0_interrupt,
+                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
+                dev_err(dev, "unable to grab IRQ %d, disabling device\n",
+                        pci->irq);
                 snd_card_disconnect(card);
                 return -EIO;
         }
-        pci_set_master(pci);
-        snd_intel8x0_chip_init(chip, 0);
-        if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_SHARED, card->shortname, chip)) {
-                printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
-                       "disabling device\n", pci->irq);
-                snd_card_disconnect(card);
-                return -EIO;
-        }
         chip->irq = pci->irq;
-        synchronize_irq(chip->irq);
+        card->sync_irq = chip->irq;
 
         /* re-initialize mixer stuff */
@@ -2677 +2631 @@
         }
 
-        /* refill nocache */
-        if (chip->fix_nocache)
-                fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 1);
-
         for (i = 0; i < chip->ncodecs; i++)
                 snd_ac97_resume(chip->ac97[i]);
-
-        /* refill nocache */
-        if (chip->fix_nocache) {
-                for (i = 0; i < chip->bdbars_count; i++) {
-                        struct ichdev *ichdev = &chip->ichd[i];
-                        if (ichdev->substream && ichdev->page_attr_changed) {
-                                struct snd_pcm_runtime *runtime = ichdev->substream->runtime;
-                                if (runtime->dma_area)
-                                        fill_nocache(runtime->dma_area, runtime->dma_bytes, 1);
-                        }
-                }
-        }
 
         /* resume status */
@@ -2713 +2651 @@
         return 0;
 }
-#endif /* CONFIG_PM */
+
+static SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume);
+#define INTEL8X0_PM_OPS &intel8x0_pm
+#else
+#define INTEL8X0_PM_OPS NULL
+#endif /* CONFIG_PM_SLEEP */
 
 #define INTEL8X0_TESTBUF_SIZE   32768   /* enough large for one shot */
 
-static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
+static void intel8x0_measure_ac97_clock(struct intel8x0 *chip)
 {
         struct snd_pcm_substream *subs;
@@ -2724 +2667 @@
         unsigned long pos, pos1, t;
         int civ, timeout = 1000, attempt = 1;
+#ifndef TARGET_OS2
+        ktime_t start_time, stop_time;
+#else
         struct timespec start_time, stop_time;
+#endif
 
         if (chip->ac97_bus->clock != 48000)
@@ -2732 +2679 @@
         subs = chip->pcm[0]->streams[0].substream;
         if (! subs || subs->dma_buffer.bytes < INTEL8X0_TESTBUF_SIZE) {
-                snd_printk(KERN_WARNING "no playback buffer allocated - aborting measure ac97 clock\n");
+                dev_warn(chip->card->dev,
+                         "no playback buffer allocated - aborting measure ac97 clock\n");
                 return;
         }
@@ -2742 +2690 @@
         /* set rate */
         if (snd_ac97_set_rate(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 48000) < 0) {
-                snd_printk(KERN_ERR "cannot set ac97 rate: clock = %d\n", chip->ac97_bus->clock);
+                dev_err(chip->card->dev, "cannot set ac97 rate: clock = %d\n",
+                        chip->ac97_bus->clock);
                 return;
         }
@@ -2756 +2705 @@
                 iputdword(chip, ICHREG(ALI_DMACR), 1 << ichdev->ali_slot);
         }
+#ifndef TARGET_OS2
+        start_time = ktime_get();
+#else
         do_posix_clock_monotonic_gettime(&start_time);
+#endif
         spin_unlock_irq(&chip->reg_lock);
         msleep(50);
@@ -2780 +2733 @@
         }
         chip->in_measurement = 0;
+#ifndef TARGET_OS2
+        stop_time = ktime_get();
+#else
         do_posix_clock_monotonic_gettime(&stop_time);
+#endif
         /* stop */
         if (chip->device_type == DEVICE_ALI) {
@@ -2796 +2753 @@
 
         if (pos == 0) {
-                snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n");
+                dev_err(chip->card->dev,
+                        "measure - unreliable DMA position..\n");
               __retry:
                 if (attempt < 3) {
@@ -2807 +2765 @@
 
         pos /= 4;
+#ifndef TARGET_OS2
+        t = ktime_us_delta(stop_time, start_time);
+#else
         t = stop_time.tv_sec - start_time.tv_sec;
         t *= 1000000;
         t += (stop_time.tv_nsec - start_time.tv_nsec) / 1000;
         dprintf(("%s: measured %lu usecs (%lu samples)\n", __func__, t, pos));
+#endif
+        dev_info(chip->card->dev,
+                 "%s: measured %lu usecs (%lu samples)\n", __func__, t, pos);
         if (t == 0) {
-                snd_printk(KERN_ERR "intel8x0: ?? calculation error..\n");
+                dev_err(chip->card->dev, "?? calculation error..\n");
                 goto __retry;
         }
@@ -2819 +2783 @@
         if (pos < 40000 || pos >= 60000) {
                 /* abnormal value. hw problem? */
-                printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos);
+                dev_info(chip->card->dev, "measured clock %ld rejected\n", pos);
                 goto __retry;
         } else if (pos > 40500 && pos < 41500)
@@ -2831 +2795 @@
                 chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos;
       __end:
-        dprintf(("intel8x0: clocking to %d\n", chip->ac97_bus->clock));
+        dev_info(chip->card->dev, "clocking to %d\n", chip->ac97_bus->clock);
         snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0);
 }
 
-static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {
+static const struct snd_pci_quirk intel8x0_clock_list[] = {
         SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),
+        SND_PCI_QUIRK(0x1014, 0x0581, "AD1981B", 48000),
         SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),
         SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),
@@ -2844 +2809 @@
 };
 
-static int __devinit intel8x0_in_clock_list(struct intel8x0 *chip)
+static int intel8x0_in_clock_list(struct intel8x0 *chip)
 {
         struct pci_dev *pci = chip->pci;
@@ -2852 +2817 @@
         if (!wl)
                 return 0;
-        printk(KERN_INFO "intel8x0: white list rate for %04x:%04x is %i\n",
+        dev_info(chip->card->dev, "allow list rate for %04x:%04x is %i\n",
                pci->subsystem_vendor, pci->subsystem_device, wl->value);
         chip->ac97_bus->clock = wl->value;
@@ -2858 +2823 @@
 }
 
-#ifdef CONFIG_PROC_FS
 static void snd_intel8x0_proc_read(struct snd_info_entry * entry,
                                    struct snd_info_buffer *buffer)
@@ -2893 +2857 @@
 }
 
-static void __devinit snd_intel8x0_proc_init(struct intel8x0 * chip)
-{
-        struct snd_info_entry *entry;
-
-        if (! snd_card_proc_new(chip->card, "intel8x0", &entry))
-                snd_info_set_text_ops(entry, chip, snd_intel8x0_proc_read);
-}
-#else
-#define snd_intel8x0_proc_init(x)
-#endif
+static void snd_intel8x0_proc_init(struct intel8x0 *chip)
+{
+        snd_card_ro_proc_new(chip->card, "intel8x0", chip,
+                             snd_intel8x0_proc_read);
+}
 
 static int snd_intel8x0_dev_free(struct snd_device *device)
@@ -2915 +2874 @@
 };
 
-static unsigned int ich_codec_bits[3] = {
+static const unsigned int ich_codec_bits[3] = {
         ICH_PCR, ICH_SCR, ICH_TCR
 };
-static unsigned int sis_codec_bits[3] = {
+static const unsigned int sis_codec_bits[3] = {
         ICH_PCR, ICH_SCR, ICH_SIS_TCR
 };
 
-static int __devinit snd_intel8x0_create(struct snd_card *card,
-                                         struct pci_dev *pci,
-                                         unsigned long device_type,
-                                         struct intel8x0 ** r_intel8x0)
+static int snd_intel8x0_inside_vm(struct pci_dev *pci)
+{
+        int result  = inside_vm;
+        char *msg   = NULL;
+
+        /* check module parameter first (override detection) */
+        if (result >= 0) {
+                msg = result ? "enable (forced) VM" : "disable (forced) VM";
+                goto fini;
+        }
+
+        /* check for known (emulated) devices */
+        result = 0;
+        if (pci->subsystem_vendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
+            pci->subsystem_device == PCI_SUBDEVICE_ID_QEMU) {
+                /* KVM emulated sound, PCI SSID: 1af4:1100 */
+                msg = "enable KVM";
+                result = 1;
+        } else if (pci->subsystem_vendor == 0x1ab8) {
+                /* Parallels VM emulated sound, PCI SSID: 1ab8:xxxx */
+                msg = "enable Parallels VM";
+                result = 1;
+        }
+
+fini:
+        if (msg != NULL)
+                dev_info(&pci->dev, "%s optimization\n", msg);
+
+        return result;
+}
+
+static int snd_intel8x0_create(struct snd_card *card,
+                               struct pci_dev *pci,
+                               unsigned long device_type,
+                               struct intel8x0 **r_intel8x0)
 {
         struct intel8x0 *chip;
@@ -2932 +2922 @@
         unsigned int int_sta_masks;
         struct ichdev *ichdev;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_intel8x0_dev_free,
         };
 
-        static unsigned int bdbars[] = {
+        static const unsigned int bdbars[] = {
                 3, /* DEVICE_INTEL */
                 6, /* DEVICE_INTEL_ICH4 */
@@ -2943 +2933 @@
                 4, /* DEVICE_NFORCE */
         };
-        static struct ich_reg_info intel_regs[6] = {
+        static const struct ich_reg_info intel_regs[6] = {
                 { ICH_PIINT, 0 },
                 { ICH_POINT, 0x10 },
@@ -2951 +2941 @@
                 { ICH_SPINT, 0x60 },
         };
-        static struct ich_reg_info nforce_regs[4] = {
+        static const struct ich_reg_info nforce_regs[4] = {
                 { ICH_PIINT, 0 },
                 { ICH_POINT, 0x10 },
@@ -2957 +2947 @@
                 { ICH_NVSPINT, 0x70 },
         };
-        static struct ich_reg_info ali_regs[6] = {
+        static const struct ich_reg_info ali_regs[6] = {
                 { ALI_INT_PCMIN, 0x40 },
                 { ALI_INT_PCMOUT, 0x50 },
@@ -2965 +2955 @@
                 { ALI_INT_SPDIFOUT, 0xb0 },
         };
-        struct ich_reg_info *tbl;
+        const struct ich_reg_info *tbl;
 
         *r_intel8x0 = NULL;
@@ -2989 +2979 @@
                 chip->xbox = 1;
 
+        chip->inside_vm = snd_intel8x0_inside_vm(pci);
+
+        /*
+         * Intel 82443MX running a 100MHz processor system bus has a hardware
+         * bug, which aborts PCI busmaster for audio transfer.  A workaround
+         * is to set the pages as non-cached.  For details, see the errata in
+         *     http://download.intel.com/design/chipsets/specupdt/24505108.pdf
+         */
         if (pci->vendor == PCI_VENDOR_ID_INTEL &&
             pci->device == PCI_DEVICE_ID_INTEL_440MX)
@@ -3010 +3008 @@
                 chip->addr = pci_iomap(pci, 0, 0);
         if (!chip->addr) {
-                snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
+                dev_err(card->dev, "AC'97 space ioremap problem\n");
                 snd_intel8x0_free(chip);
                 return -EIO;
@@ -3018 +3016 @@
         else
                 chip->bmaddr = pci_iomap(pci, 1, 0);
+
+ port_inited:
         if (!chip->bmaddr) {
-                snd_printk(KERN_ERR "Controller space ioremap problem\n");
+                dev_err(card->dev, "Controller space ioremap problem\n");
                 snd_intel8x0_free(chip);
                 return -EIO;
         }
-
- port_inited:
         chip->bdbars_count = bdbars[device_type];
 
@@ -3060 +3058 @@
         /* allocate buffer descriptor lists */
         /* the start of each lists must be aligned to 8 bytes */
-        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+        if (snd_dma_alloc_pages(intel8x0_dma_type(chip), &pci->dev,
                                 chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,
                                 &chip->bdbars) < 0) {
                 snd_intel8x0_free(chip);
-                snd_printk(KERN_ERR "intel8x0: cannot allocate buffer descriptors\n");
+                dev_err(card->dev, "cannot allocate buffer descriptors\n");
                 return -ENOMEM;
         }
         /* tables must be aligned to 8 bytes here, but the kernel pages
            are much bigger, so we don't care (on i386) */
-        /* workaround for 440MX */
-        if (chip->fix_nocache)
-                fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 1);
         int_sta_masks = 0;
         for (i = 0; i < chip->bdbars_count; i++) {
                 ichdev = &chip->ichd[i];
-                ichdev->bdbar = ((u32 *)chip->bdbars.area) +
+                ichdev->bdbar = ((__le32 *)chip->bdbars.area) +
                         (i * ICH_MAX_FRAGS * 2);
                 ichdev->bdbar_addr = chip->bdbars.addr +
@@ -3117 +3112 @@
         /* request irq after initializaing int_sta_mask, etc */
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_SHARED, card->shortname, chip)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
@@ -3129 +3125 @@
         }
 
-        snd_card_set_dev(card, &pci->dev);
-
         *r_intel8x0 = chip;
         return 0;
@@ -3138 +3132 @@
         unsigned int id;
         const char *s;
-} shortnames[] __devinitdata = {
+} shortnames[] = {
         { PCI_DEVICE_ID_INTEL_82801AA_5, "Intel 82801AA-ICH" },
         { PCI_DEVICE_ID_INTEL_82801AB_5, "Intel 82901AB-ICH0" },
@@ -3164 +3158 @@
 };
 
-#ifdef NOT_USED
-static struct snd_pci_quirk spdif_aclink_defaults[] __devinitdata = {
+static const struct snd_pci_quirk spdif_aclink_defaults[] = {
         SND_PCI_QUIRK(0x147b, 0x1c1a, "ASUS KN8", 1),
         {0} /* end */
 };
-#endif
-
-/* look up white/black list for SPDIF over ac-link */
-static int __devinit check_default_spdif_aclink(struct pci_dev *pci)
-{
-#ifndef TARGET_OS2
+
+/* look up allow/deny list for SPDIF over ac-link */
+static int check_default_spdif_aclink(struct pci_dev *pci)
+{
         const struct snd_pci_quirk *w;
 
@@ -3180 +3171 @@
         if (w) {
                 if (w->value)
-                        snd_printdd(KERN_INFO "intel8x0: Using SPDIF over "
-                                    "AC-Link for %s\n", w->name);
+                        dev_dbg(&pci->dev,
+                                "Using SPDIF over AC-Link for %s\n",
+                                    snd_pci_quirk_name(w));
                 else
-                        snd_printdd(KERN_INFO "intel8x0: Using integrated "
-                                    "SPDIF DMA for %s\n", w->name);
+                        dev_dbg(&pci->dev,
+                                "Using integrated SPDIF DMA for %s\n",
+                                    snd_pci_quirk_name(w));
                 return w->value;
         }
-#endif
         return 0;
 }
 
-static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
-                                        const struct pci_device_id *pci_id)
+static int snd_intel8x0_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         struct snd_card *card;
@@ -3199 +3191 @@
         struct shortname_table *name;
 
-        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index, id, THIS_MODULE, 0, &card);
         if (err < 0)
                 return err;
@@ -3274 +3266 @@
 }
 
-static void __devexit snd_intel8x0_remove(struct pci_dev *pci)
+static void snd_intel8x0_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-static struct pci_driver driver = {
-        .name = "Intel ICH",
+}
+
+static struct pci_driver intel8x0_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_intel8x0_ids,
         .probe = snd_intel8x0_probe,
-        .remove = __devexit_p(snd_intel8x0_remove),
-#ifdef CONFIG_PM
-        .suspend = intel8x0_suspend,
-        .resume = intel8x0_resume,
-#endif
-};
-
-
-static int __init alsa_card_intel8x0_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_intel8x0_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_intel8x0_init)
-module_exit(alsa_card_intel8x0_exit)
+        .remove = snd_intel8x0_remove,
+        .driver = {
+                .pm = INTEL8X0_PM_OPS,
+        },
+};
+
+module_pci_driver(intel8x0_driver);