Changeset 679 for GPL/trunk/alsa-kernel/pci/maestro3.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/maestro3.c (modified) (61 diffs)

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Driver for ESS Maestro3/Allegro (ES1988) soundcards.
@@ -7 +8 @@
  * OSS/Free by Zach Brown.  Many thanks to Zach!
  *
- *   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
- *
- *
  * ChangeLog:
  * Aug. 27, 2001
  *     - Fixed deadlock on capture
  *     - Added Canyon3D-2 support by Rob Riggs <rob@pangalactic.org>
- *
  */
  
 #define CARD_NAME "ESS Maestro3/Allegro/Canyon3D-2"
 #define DRIVER_NAME "Maestro3"
-
-#include <asm/io.h>
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "Maestro3"
+#endif
+
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -40 +28 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/input.h>
@@ -65 +53 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* all enabled */
 #ifndef TARGET_OS2
-static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 static int amp_gpio[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 #else
@@ -366 +354 @@
 #define DSP2HOST_REQ_TIMER      0x04
 
-/* AC97 registers */
-/* XXX fix this crap up */
-/*#define AC97_RESET              0x00*/
-
-#define AC97_VOL_MUTE_B         0x8000
-#define AC97_VOL_M              0x1F
-#define AC97_LEFT_VOL_S         8
-
-#define AC97_MASTER_VOL         0x02
-#define AC97_LINE_LEVEL_VOL     0x04
-#define AC97_MASTER_MONO_VOL    0x06
-#define AC97_PC_BEEP_VOL        0x0A
-#define AC97_PC_BEEP_VOL_M      0x0F
-#define AC97_SROUND_MASTER_VOL  0x38
-#define AC97_PC_BEEP_VOL_S      1
-
-/*#define AC97_PHONE_VOL          0x0C
-#define AC97_MIC_VOL            0x0E*/
-#define AC97_MIC_20DB_ENABLE    0x40
-
-/*#define AC97_LINEIN_VOL         0x10
-#define AC97_CD_VOL             0x12
-#define AC97_VIDEO_VOL          0x14
-#define AC97_AUX_VOL            0x16*/
-#define AC97_PCM_OUT_VOL        0x18
-/*#define AC97_RECORD_SELECT      0x1A*/
-#define AC97_RECORD_MIC         0x00
-#define AC97_RECORD_CD          0x01
-#define AC97_RECORD_VIDEO       0x02
-#define AC97_RECORD_AUX         0x03
-#define AC97_RECORD_MONO_MUX    0x02
-#define AC97_RECORD_DIGITAL     0x03
-#define AC97_RECORD_LINE        0x04
-#define AC97_RECORD_STEREO      0x05
-#define AC97_RECORD_MONO        0x06
-#define AC97_RECORD_PHONE       0x07
-
-/*#define AC97_RECORD_GAIN        0x1C*/
-#define AC97_RECORD_VOL_M       0x0F
-
-/*#define AC97_GENERAL_PURPOSE    0x20*/
-#define AC97_POWER_DOWN_CTRL    0x26
-#define AC97_ADC_READY          0x0001
-#define AC97_DAC_READY          0x0002
-#define AC97_ANALOG_READY       0x0004
-#define AC97_VREF_ON            0x0008
-#define AC97_PR0                0x0100
-#define AC97_PR1                0x0200
-#define AC97_PR2                0x0400
-#define AC97_PR3                0x0800
-#define AC97_PR4                0x1000
-
-#define AC97_RESERVED1          0x28
-
-#define AC97_VENDOR_TEST        0x5A
-
-#define AC97_CLOCK_DELAY        0x5C
-#define AC97_LINEOUT_MUX_SEL    0x0001
-#define AC97_MONO_MUX_SEL       0x0002
-#define AC97_CLOCK_DELAY_SEL    0x1F
-#define AC97_DAC_CDS_SHIFT      6
-#define AC97_ADC_CDS_SHIFT      11
-
-#define AC97_MULTI_CHANNEL_SEL  0x74
-
-/*#define AC97_VENDOR_ID1         0x7C
-#define AC97_VENDOR_ID2         0x7E*/
-
 /*
  * ASSP control regs
@@ -855 +775 @@
         char phys[64];                  /* physical device path */
 #else
-        spinlock_t ac97_lock;
         struct snd_kcontrol *master_switch;
         struct snd_kcontrol *master_volume;
-        struct tasklet_struct hwvol_tq;
 #endif
+        struct work_struct hwvol_work;
 
         unsigned int in_suspend;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         u16 *suspend_mem;
 #endif
@@ -874 +793 @@
  * pci ids
  */
-static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = {
+static const struct pci_device_id snd_m3_ids[] = {
         {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
          PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
@@ -896 +815 @@
 MODULE_DEVICE_TABLE(pci, snd_m3_ids);
 
-static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
+static const struct snd_pci_quirk m3_amp_quirk_list[] = {
         SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
         SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
@@ -905 +824 @@
 };
 
-static struct snd_pci_quirk m3_irda_quirk_list[] __devinitdata = {
+static const struct snd_pci_quirk m3_irda_quirk_list[] = {
         SND_PCI_QUIRK(0x1028, 0x00b0, "Dell Inspiron 4000", 1),
         SND_PCI_QUIRK(0x1028, 0x00a4, "Dell Inspiron 8000", 1),
@@ -913 +832 @@
 
 /* hardware volume quirks */
-static struct snd_pci_quirk m3_hv_quirk_list[] __devinitdata = {
+static const struct snd_pci_quirk m3_hv_quirk_list[] = {
         /* Allegro chips */
         SND_PCI_QUIRK(0x0E11, 0x002E, NULL, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD),
@@ -991 +910 @@
 
 /* HP Omnibook quirks */
-static struct snd_pci_quirk m3_omnibook_quirk_list[] __devinitdata = {
+static const struct snd_pci_quirk m3_omnibook_quirk_list[] = {
         SND_PCI_QUIRK_ID(0x103c, 0x0010), /* HP OmniBook 6000 */
         SND_PCI_QUIRK_ID(0x103c, 0x0011), /* HP OmniBook 500 */
@@ -1470 +1389 @@
 {
         struct m3_dma *s = substream->runtime->private_data;
-        int err;
-
-        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-                return err;
+
         /* set buffer address */
         s->buffer_addr = substream->runtime->dma_addr;
         if (s->buffer_addr & 0x3) {
-                snd_printk(KERN_ERR "oh my, not aligned\n");
+                dev_err(substream->pcm->card->dev, "oh my, not aligned\n");
                 s->buffer_addr = s->buffer_addr & ~0x3;
         }
@@ -1490 +1406 @@
                 return 0;
         s = substream->runtime->private_data;
-        snd_pcm_lib_free_pages(substream);
         s->buffer_addr = 0;
         return 0;
@@ -1614 +1529 @@
    generating an interrupt. The pair of counters is stored in bits 1-3 and 5-7
    of a byte wide register. The meaning of bits 0 and 4 is unknown. */
-static void snd_m3_update_hw_volume(unsigned long private_data)
-{
-        struct snd_m3 *chip = (struct snd_m3 *) private_data;
+static void snd_m3_update_hw_volume(struct work_struct *work)
+{
+        struct snd_m3 *chip = container_of(work, struct snd_m3, hwvol_work);
         int x, val;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        unsigned long flags;
-#endif
 
         /* Figure out which volume control button was pushed,
@@ -1650 +1562 @@
                 return;
 
-        /* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */
-        spin_lock_irqsave(&chip->ac97_lock, flags);
-
-        val = chip->ac97->regs[AC97_MASTER_VOL];
+        val = snd_ac97_read(chip->ac97, AC97_MASTER);
         switch (x) {
         case 0x88:
@@ -1660 +1569 @@
                    happens when pressing the mute button. */
                 val ^= 0x8000;
-                chip->ac97->regs[AC97_MASTER_VOL] = val;
-                outw(val, chip->iobase + CODEC_DATA);
-                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
-                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
-                               &chip->master_switch->id);
                 break;
         case 0xaa:
@@ -1672 +1576 @@
                 if ((val & 0x7f00) > 0)
                         val -= 0x0100;
-                chip->ac97->regs[AC97_MASTER_VOL] = val;
-                outw(val, chip->iobase + CODEC_DATA);
-                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
-                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
-                               &chip->master_volume->id);
                 break;
         case 0x66:
@@ -1684 +1583 @@
                 if ((val & 0x7f00) < 0x1f00)
                         val += 0x0100;
-                chip->ac97->regs[AC97_MASTER_VOL] = val;
-                outw(val, chip->iobase + CODEC_DATA);
-                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
+                break;
+        }
+        if (snd_ac97_update(chip->ac97, AC97_MASTER, val))
                 snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
-                               &chip->master_volume->id);
-                break;
-        }
-        spin_unlock_irqrestore(&chip->ac97_lock, flags);
+                               &chip->master_switch->id);
 #else
         if (!chip->input_dev)
@@ -1735 +1631 @@
 
         if (status & HV_INT_PENDING)
-#ifdef CONFIG_SND_MAESTRO3_INPUT
-                snd_m3_update_hw_volume((unsigned long)chip);
-#else
-                tasklet_schedule(&chip->hwvol_tq);
-#endif
+                schedule_work(&chip->hwvol_work);
 
         /*
@@ -1778 +1670 @@
  */
 
-static struct snd_pcm_hardware snd_m3_playback =
+static const struct snd_pcm_hardware snd_m3_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP |
@@ -1799 +1691 @@
 };
 
-static struct snd_pcm_hardware snd_m3_capture =
+static const struct snd_pcm_hardware snd_m3_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP |
@@ -1931 +1823 @@
  */
 
-static struct snd_pcm_ops snd_m3_playback_ops = {
+static const struct snd_pcm_ops snd_m3_playback_ops = {
         .open =         snd_m3_playback_open,
         .close =        snd_m3_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_m3_pcm_hw_params,
         .hw_free =      snd_m3_pcm_hw_free,
@@ -1942 +1833 @@
 };
 
-static struct snd_pcm_ops snd_m3_capture_ops = {
+static const struct snd_pcm_ops snd_m3_capture_ops = {
         .open =         snd_m3_capture_open,
         .close =        snd_m3_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_m3_pcm_hw_params,
         .hw_free =      snd_m3_pcm_hw_free,
@@ -1953 +1843 @@
 };
 
-static int __devinit
+static int
 snd_m3_pcm(struct snd_m3 * chip, int device)
 {
@@ -1972 +1862 @@
         chip->pcm = pcm;
         
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(chip->pci), 64*1024, 64*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &chip->pci->dev, 64*1024, 64*1024);
 
         return 0;
@@ -1997 +1887 @@
         } while (i-- > 0);
 
-        snd_printk(KERN_ERR "ac97 serial bus busy\n");
+        dev_err(chip->card->dev, "ac97 serial bus busy\n");
         return 1;
 }
@@ -2005 +1895 @@
 {
         struct snd_m3 *chip = ac97->private_data;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        unsigned long flags;
-#endif
         unsigned short data = 0xffff;
 
         if (snd_m3_ac97_wait(chip))
                 goto fail;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        spin_lock_irqsave(&chip->ac97_lock, flags);
-#endif
         snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND);
         if (snd_m3_ac97_wait(chip))
-                goto fail_unlock;
+                goto fail;
         data = snd_m3_inw(chip, CODEC_DATA);
-fail_unlock:
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        spin_unlock_irqrestore(&chip->ac97_lock, flags);
-#endif
 fail:
         return data;
@@ -2031 +1911 @@
 {
         struct snd_m3 *chip = ac97->private_data;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        unsigned long flags;
-#endif
 
         if (snd_m3_ac97_wait(chip))
                 return;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        spin_lock_irqsave(&chip->ac97_lock, flags);
-#endif
         snd_m3_outw(chip, val, CODEC_DATA);
         snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        spin_unlock_irqrestore(&chip->ac97_lock, flags);
-#endif
-}
-
-
-static void snd_m3_remote_codec_config(int io, int isremote)
-{
+        /*
+         * Workaround for buggy ES1988 integrated AC'97 codec. It remains silent
+         * until the MASTER volume or mute is touched (alsactl restore does not
+         * work).
+         */
+        if (ac97->id == 0x45838308 && reg == AC97_MASTER) {
+                snd_m3_ac97_wait(chip);
+                snd_m3_outw(chip, val, CODEC_DATA);
+                snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+        }
+}
+
+
+static void snd_m3_remote_codec_config(struct snd_m3 *chip, int isremote)
+{
+        int io = chip->iobase;
+        u16 tmp;
+
         isremote = isremote ? 1 : 0;
 
-        outw((inw(io + RING_BUS_CTRL_B) & ~SECOND_CODEC_ID_MASK) | isremote,
-             io + RING_BUS_CTRL_B);
+        tmp = inw(io + RING_BUS_CTRL_B) & ~SECOND_CODEC_ID_MASK;
+        /* enable dock on Dell Latitude C810 */
+        if (chip->pci->subsystem_vendor == 0x1028 &&
+            chip->pci->subsystem_device == 0x00e5)
+                tmp |= M3I_DOCK_ENABLE;
+        outw(tmp | isremote, io + RING_BUS_CTRL_B);
         outw((inw(io + SDO_OUT_DEST_CTRL) & ~COMMAND_ADDR_OUT) | isremote,
              io + SDO_OUT_DEST_CTRL);
@@ -2105 +1993 @@
                         dir |= 0x10; /* assuming pci bus master? */
 
-                snd_m3_remote_codec_config(io, 0);
+                snd_m3_remote_codec_config(chip, 0);
 
                 outw(IO_SRAM_ENABLE, io + RING_BUS_CTRL_A);
@@ -2131 +2019 @@
                 delay2 += 100;
 
-                snd_printd("maestro3: retrying codec reset with delays of %d and %d ms\n",
+                dev_dbg(chip->card->dev,
+                        "retrying codec reset with delays of %d and %d ms\n",
                            delay1, delay2);
         }
@@ -2147 +2036 @@
 }
 
-static int __devinit snd_m3_mixer(struct snd_m3 *chip)
+static int snd_m3_mixer(struct snd_m3 *chip)
 {
         struct snd_ac97_bus *pbus;
@@ -2155 +2044 @@
 #endif
         int err;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_m3_ac97_write,
                 .read = snd_m3_ac97_read,
@@ -2201 +2090 @@
 {
         unsigned int i;
-        const u16 *data;
+        const __le16 *data;
 
         /* zero kernel data */
@@ -2219 +2108 @@
 
         /* write kernel into code memory.. */
-        data = (const u16 *)chip->assp_kernel_image->data;
+        data = (const __le16 *)chip->assp_kernel_image->data;
         for (i = 0 ; i * 2 < chip->assp_kernel_image->size; i++) {
                 snd_m3_assp_write(chip, MEMTYPE_INTERNAL_CODE, 
@@ -2232 +2121 @@
          * need vectors, so we won't bother with them..
          */
-        data = (const u16 *)chip->assp_minisrc_image->data;
+        data = (const __le16 *)chip->assp_minisrc_image->data;
         for (i = 0; i * 2 < chip->assp_minisrc_image->size; i++) {
                 snd_m3_assp_write(chip, MEMTYPE_INTERNAL_CODE, 
@@ -2289 +2178 @@
 
 
-static int __devinit snd_m3_assp_client_init(struct snd_m3 *chip, struct m3_dma *s, int index)
+static int snd_m3_assp_client_init(struct snd_m3 *chip, struct m3_dma *s, int index)
 {
         int data_bytes = 2 * ( MINISRC_TMP_BUFFER_SIZE / 2 + 
@@ -2310 +2199 @@
 
         if ((address + (data_bytes/2)) >= 0x1c00) {
-                snd_printk(KERN_ERR "no memory for %d bytes at ind %d (addr 0x%x)\n",
+                dev_err(chip->card->dev,
+                        "no memory for %d bytes at ind %d (addr 0x%x)\n",
                            data_bytes, index, address);
                 return -ENOMEM;
@@ -2463 +2353 @@
         int i;
 
+        cancel_work_sync(&chip->hwvol_work);
 #ifdef CONFIG_SND_MAESTRO3_INPUT
         if (chip->input_dev)
@@ -2483 +2374 @@
         }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         vfree(chip->suspend_mem);
 #endif
@@ -2505 +2396 @@
  * APM support
  */
-#ifdef CONFIG_PM
-static int m3_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+#ifdef CONFIG_PM_SLEEP
+static int m3_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_m3 *chip = card->private_data;
         int i, dsp_index;
@@ -2516 +2407 @@
 
         chip->in_suspend = 1;
+        cancel_work_sync(&chip->hwvol_work);
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(chip->pcm);
         snd_ac97_suspend(chip->ac97);
 
@@ -2532 +2423 @@
                 chip->suspend_mem[dsp_index++] =
                         snd_m3_assp_read(chip, MEMTYPE_INTERNAL_DATA, i);
-
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
-static int m3_resume(struct pci_dev *pci)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int m3_resume(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_m3 *chip = card->private_data;
         int i, dsp_index;
@@ -2547 +2434 @@
         if (chip->suspend_mem == NULL)
                 return 0;
-
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "maestor3: pci_enable_device failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
 
         /* first lets just bring everything back. .*/
@@ -2592 +2469 @@
         return 0;
 }
-#endif /* CONFIG_PM */
+
+static SIMPLE_DEV_PM_OPS(m3_pm, m3_suspend, m3_resume);
+#define M3_PM_OPS       &m3_pm
+#else
+#define M3_PM_OPS       NULL
+#endif /* CONFIG_PM_SLEEP */
 
 #ifdef CONFIG_SND_MAESTRO3_INPUT
-static int __devinit snd_m3_input_register(struct snd_m3 *chip)
+static int snd_m3_input_register(struct snd_m3 *chip)
 {
         struct input_dev *input_dev;
@@ -2639 +2521 @@
 }
 
-static int __devinit
+static int
 snd_m3_create(struct snd_card *card, struct pci_dev *pci,
               int enable_amp,
@@ -2648 +2530 @@
         int i, err;
         const struct snd_pci_quirk *quirk;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_m3_dev_free,
         };
@@ -2658 +2540 @@
 
         /* check, if we can restrict PCI DMA transfers to 28 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
-                snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
+                dev_err(card->dev,
+                        "architecture does not support 28bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
@@ -2672 +2555 @@
 
         spin_lock_init(&chip->reg_lock);
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        spin_lock_init(&chip->ac97_lock);
-#endif
 
         switch (pci->device) {
@@ -2688 +2568 @@
         chip->pci = pci;
         chip->irq = -1;
+        INIT_WORK(&chip->hwvol_work, snd_m3_update_hw_volume);
 
         chip->external_amp = enable_amp;
@@ -2695 +2576 @@
                 quirk = snd_pci_quirk_lookup(pci, m3_amp_quirk_list);
                 if (quirk) {
-#ifndef TARGET_OS2
-                        snd_printdd(KERN_INFO "maestro3: set amp-gpio "
-                                    "for '%s'\n", quirk->name);
-#endif
+                        dev_info(card->dev, "set amp-gpio for '%s'\n",
+                                 snd_pci_quirk_name(quirk));
                         chip->amp_gpio = quirk->value;
                 } else if (chip->allegro_flag)
@@ -2708 +2587 @@
         quirk = snd_pci_quirk_lookup(pci, m3_irda_quirk_list);
         if (quirk) {
-#ifndef TARGET_OS2
-                snd_printdd(KERN_INFO "maestro3: enabled irda workaround "
-                            "for '%s'\n", quirk->name);
-#endif
+                dev_info(card->dev, "enabled irda workaround for '%s'\n",
+                         snd_pci_quirk_name(quirk));
                 chip->irda_workaround = 1;
         }
@@ -2731 +2608 @@
         err = request_firmware(&chip->assp_kernel_image,
                                "ess/maestro3_assp_kernel.fw", &pci->dev);
-        if (err < 0) {
-                snd_m3_free(chip);
-                return err;
-        }
+        if (err < 0)
+                goto free_chip;
 
         err = request_firmware(&chip->assp_minisrc_image,
                                "ess/maestro3_assp_minisrc.fw", &pci->dev);
-        if (err < 0) {
-                snd_m3_free(chip);
-                return err;
-        }
-
-        if ((err = pci_request_regions(pci, card->driver)) < 0) {
-                snd_m3_free(chip);
-                return err;
-        }
+        if (err < 0)
+                goto free_chip;
+
+        err = pci_request_regions(pci, card->driver);
+        if (err < 0)
+                goto free_chip;
+
         chip->iobase = pci_resource_start(pci, 0);
         
@@ -2761 +2634 @@
         snd_m3_hv_init(chip);
 
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-        tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
+        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
+                        KBUILD_MODNAME, chip)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
+                err = -ENOMEM;
+                goto free_chip;
+        }
+        chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
+
+#ifdef CONFIG_PM_SLEEP
+        chip->suspend_mem =
+                vmalloc(array_size(sizeof(u16),
+                                   REV_B_CODE_MEMORY_LENGTH +
+                                        REV_B_DATA_MEMORY_LENGTH));
+        if (chip->suspend_mem == NULL)
+                dev_warn(card->dev, "can't allocate apm buffer\n");
 #endif
 
-        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
-                        card->driver, chip)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
-                snd_m3_free(chip);
-                return -ENOMEM;
-        }
-        chip->irq = pci->irq;
-
-#ifdef CONFIG_PM
-        chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH));
-        if (chip->suspend_mem == NULL)
-                snd_printk(KERN_WARNING "can't allocate apm buffer\n");
-#endif
-
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
-                snd_m3_free(chip);
-                return err;
-        }
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0)
+                goto free_chip;
 
         if ((err = snd_m3_mixer(chip)) < 0)
@@ -2800 +2672 @@
                 err = snd_m3_input_register(chip);
                 if (err)
-                        snd_printk(KERN_WARNING "Input device registration "
-                                "failed with error %i", err);
+                        dev_warn(card->dev,
+                                 "Input device registration failed with error %i",
+                                 err);
         }
 #endif
@@ -2808 +2681 @@
         snd_m3_assp_continue(chip);
 
-        snd_card_set_dev(card, &pci->dev);
-
         *chip_ret = chip;
 
         return 0; 
+
+free_chip:
+        snd_m3_free(chip);
+        return err;
 }
 
 /*
  */
-static int __devinit
+static int
 snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 {
@@ -2825 +2700 @@
         int err;
 
-#ifndef TARGET_OS2
         /* don't pick up modems */
         if (((pci->class >> 8) & 0xffff) != PCI_CLASS_MULTIMEDIA_AUDIO)
                 return -ENODEV;
-#endif
+
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
@@ -2837 +2711 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
         if (err < 0)
                 return err;
@@ -2855 +2730 @@
         }
 
-        if ((err = snd_m3_create(card, pci,
-                                 external_amp[dev],
-                                 amp_gpio[dev],
-                                 &chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_m3_create(card, pci, external_amp[dev], amp_gpio[dev], &chip);
+        if (err < 0)
+                goto free_card;
+
         card->private_data = chip;
 
@@ -2868 +2740 @@
                 card->shortname, chip->iobase, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_card_register(card);
+        if (err < 0)
+                goto free_card;
 
 #if 0 /* TODO: not supported yet */
@@ -2877 +2748 @@
         err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401,
                                   chip->iobase + MPU401_DATA_PORT,
-                                  MPU401_INFO_INTEGRATED,
-                                  chip->irq, 0, &chip->rmidi);
+                                  MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,
+                                  -1, &chip->rmidi);
         if (err < 0)
-                printk(KERN_WARNING "maestro3: no MIDI support.\n");
+                dev_warn(card->dev, "no MIDI support.\n");
 #endif
 
@@ -2886 +2757 @@
         dev++;
         return 0;
-}
-
-static void __devexit snd_m3_remove(struct pci_dev *pci)
+
+free_card:
+        snd_card_free(card);
+        return err;
+}
+
+static void snd_m3_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-static struct pci_driver driver = {
-        .name = "Maestro3",
+}
+
+static struct pci_driver m3_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_m3_ids,
         .probe = snd_m3_probe,
-        .remove = __devexit_p(snd_m3_remove),
-#ifdef CONFIG_PM
-        .suspend = m3_suspend,
-        .resume = m3_resume,
-#endif
+        .remove = snd_m3_remove,
+        .driver = {
+                .pm = M3_PM_OPS,
+        },
 };
         
-static int __init alsa_card_m3_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_m3_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_m3_init)
-module_exit(alsa_card_m3_exit)
+module_pci_driver(m3_driver);