Changeset 615 for GPL/branches/uniaud32-next/alsa-kernel/pci/cmipci.c

Timestamp:

Jan 1, 2021, 5:31:48 AM (5 years ago)

Author:

Paul Smedley

Message:

Add source for uniaud32 based on code from linux kernel 5.4.86

Location:

GPL/branches/uniaud32-next

Files:

• . (copied) (copied from GPL/branches/uniaud32-linux-3.2.102 )
• alsa-kernel/pci/cmipci.c (modified) (62 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/cmipci.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Driver for C-Media CMI8338 and 8738 PCI soundcards.
  * Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>
- *
- *   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
  */
  
@@ -21 +8 @@
 /* #define USE_VAR48KRATE */
 
-#ifdef TARGET_OS2
-#define KBUILD_MODNAME "cmipci"
-#endif
-
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -45 +28 @@
 #include <sound/initval.h>
 
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "cmipci"
+#endif
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("C-Media CMI8x38 PCI");
@@ -53 +39 @@
                 "{C-Media,CMI8338B}}");
 
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+#if IS_REACHABLE(CONFIG_GAMEPORT)
 #define SUPPORT_JOYSTICK 1
 #endif
@@ -59 +45 @@
 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;      /* Enable switches */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable switches */
 static long mpu_port[SNDRV_CARDS];
 #ifndef TARGET_OS2
 static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
-static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
+static bool soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
 #else
 static long fm_port[SNDRV_CARDS] = {0x388, -1,-1,-1,-1,-1,-1,-1};
-static int soft_ac3[SNDRV_CARDS] = {0,1,1,1,1,1,1,1};
+static bool soft_ac3[SNDRV_CARDS] = {0,1,1,1,1,1,1,1};
 #endif
 #ifdef SUPPORT_JOYSTICK
@@ -78 +64 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable C-Media PCI soundcard.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port.");
 module_param_array(soft_ac3, bool, NULL, 0444);
 MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");
 #ifdef SUPPORT_JOYSTICK
-module_param_array(joystick_port, int, NULL, 0444);
+module_param_hw_array(joystick_port, int, ioport, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #endif
@@ -514 +500 @@
         spinlock_t reg_lock;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         unsigned int saved_regs[0x20];
         unsigned char saved_mixers[0x20];
@@ -729 +715 @@
  */
 
-static unsigned int hw_channels[] = {1, 2, 4, 6, 8};
-static struct snd_pcm_hw_constraint_list hw_constraints_channels_4 = {
+static const unsigned int hw_channels[] = {1, 2, 4, 6, 8};
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_4 = {
         .count = 3,
         .list = hw_channels,
         .mask = 0,
 };
-static struct snd_pcm_hw_constraint_list hw_constraints_channels_6 = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_6 = {
         .count = 4,
         .list = hw_channels,
         .mask = 0,
 };
-static struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {
         .count = 5,
         .list = hw_channels,
@@ -806 +792 @@
                 rec->fmt |= 0x01;
         if (rec->is_dac && set_dac_channels(cm, rec, runtime->channels) < 0) {
-                snd_printd("cannot set dac channels\n");
+                dev_dbg(cm->card->dev, "cannot set dac channels\n");
                 return -EINVAL;
         }
@@ -837 +823 @@
                 cm->ctrl |= val;
         snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl);
-        //snd_printd("cmipci: functrl0 = %08x\n", cm->ctrl);
+        /* dev_dbg(cm->card->dev, "functrl0 = %08x\n", cm->ctrl); */
 
         /* set sample rate */
@@ -860 +846 @@
         }
         snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);
-        //snd_printd("cmipci: functrl1 = %08x\n", val);
+        dev_dbg(cm->card->dev, "functrl1 = %08x\n", val);
 
         /* set format */
@@ -876 +862 @@
         }
         snd_cmipci_write(cm, CM_REG_CHFORMAT, val);
-        //snd_printd("cmipci: chformat = %08x\n", val);
+        dev_dbg(cm->card->dev, "chformat = %08x\n", val);
 
         if (!rec->is_dac && cm->chip_version) {
@@ -914 +900 @@
                 /* enable channel */
                 snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl);
-                //snd_printd("cmipci: functrl0 = %08x\n", cm->ctrl);
+                dev_dbg(cm->card->dev, "functrl0 = %08x\n", cm->ctrl);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
@@ -962 +948 @@
                         goto ok;
         } 
-        printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);
+        dev_err(cm->card->dev, "invalid PCM pointer: %#x\n", rem);
         return SNDRV_PCM_POS_XRUN;
 ok:
@@ -1055 +1041 @@
 }
 
-static struct snd_kcontrol_new snd_cmipci_spdif_default __devinitdata =
+static const struct snd_kcontrol_new snd_cmipci_spdif_default =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
@@ -1082 +1068 @@
 }
 
-static struct snd_kcontrol_new snd_cmipci_spdif_mask __devinitdata =
+static const struct snd_kcontrol_new snd_cmipci_spdif_mask =
 {
         .access =       SNDRV_CTL_ELEM_ACCESS_READ,
@@ -1129 +1115 @@
 }
 
-static struct snd_kcontrol_new snd_cmipci_spdif_stream __devinitdata =
+static const struct snd_kcontrol_new snd_cmipci_spdif_stream =
 {
         .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
@@ -1149 +1135 @@
                 unsigned int i;
 
-                val = kmalloc(sizeof(*val), GFP_ATOMIC);
+                val = kmalloc(sizeof(*val), GFP_KERNEL);
                 if (!val)
                         return -ENOMEM;
@@ -1487 +1473 @@
 
 /* playback on channel A */
-static struct snd_pcm_hardware snd_cmipci_playback =
+static const struct snd_pcm_hardware snd_cmipci_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1507 +1493 @@
 
 /* capture on channel B */
-static struct snd_pcm_hardware snd_cmipci_capture =
+static const struct snd_pcm_hardware snd_cmipci_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1527 +1513 @@
 
 /* playback on channel B - stereo 16bit only? */
-static struct snd_pcm_hardware snd_cmipci_playback2 =
+static const struct snd_pcm_hardware snd_cmipci_playback2 =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1547 +1533 @@
 
 /* spdif playback on channel A */
-static struct snd_pcm_hardware snd_cmipci_playback_spdif =
+static const struct snd_pcm_hardware snd_cmipci_playback_spdif =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1567 +1553 @@
 
 /* spdif playback on channel A (32bit, IEC958 subframes) */
-static struct snd_pcm_hardware snd_cmipci_playback_iec958_subframe =
+static const struct snd_pcm_hardware snd_cmipci_playback_iec958_subframe =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1587 +1573 @@
 
 /* spdif capture on channel B */
-static struct snd_pcm_hardware snd_cmipci_capture_spdif =
+static const struct snd_pcm_hardware snd_cmipci_capture_spdif =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -1607 +1593 @@
 };
 
-static unsigned int rate_constraints[] = { 5512, 8000, 11025, 16000, 22050,
+static const unsigned int rate_constraints[] = { 5512, 8000, 11025, 16000, 22050,
                         32000, 44100, 48000, 88200, 96000, 128000 };
-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {
                 .count = ARRAY_SIZE(rate_constraints),
                 .list = rate_constraints,
@@ -1848 +1834 @@
  */
 
-static struct snd_pcm_ops snd_cmipci_playback_ops = {
+static const struct snd_pcm_ops snd_cmipci_playback_ops = {
         .open =         snd_cmipci_playback_open,
         .close =        snd_cmipci_playback_close,
@@ -1859 +1845 @@
 };
 
-static struct snd_pcm_ops snd_cmipci_capture_ops = {
+static const struct snd_pcm_ops snd_cmipci_capture_ops = {
         .open =         snd_cmipci_capture_open,
         .close =        snd_cmipci_capture_close,
@@ -1870 +1856 @@
 };
 
-static struct snd_pcm_ops snd_cmipci_playback2_ops = {
+static const struct snd_pcm_ops snd_cmipci_playback2_ops = {
         .open =         snd_cmipci_playback2_open,
         .close =        snd_cmipci_playback2_close,
@@ -1881 +1867 @@
 };
 
-static struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {
+static const struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {
         .open =         snd_cmipci_playback_spdif_open,
         .close =        snd_cmipci_playback_spdif_close,
@@ -1892 +1878 @@
 };
 
-static struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {
+static const struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {
         .open =         snd_cmipci_capture_spdif_open,
         .close =        snd_cmipci_capture_spdif_close,
@@ -1907 +1893 @@
  */
 
-static int __devinit snd_cmipci_pcm_new(struct cmipci *cm, int device)
+static int snd_cmipci_pcm_new(struct cmipci *cm, int device)
 {
         struct snd_pcm *pcm;
@@ -1930 +1916 @@
 }
 
-static int __devinit snd_cmipci_pcm2_new(struct cmipci *cm, int device)
+static int snd_cmipci_pcm2_new(struct cmipci *cm, int device)
 {
         struct snd_pcm *pcm;
@@ -1952 +1938 @@
 }
 
-static int __devinit snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)
+static int snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)
 {
         struct snd_pcm *pcm;
@@ -1971 +1957 @@
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               snd_dma_pci_data(cm->pci), 64*1024, 128*1024);
+
+        err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                                     snd_pcm_alt_chmaps, cm->max_channels, 0,
+                                     NULL);
+        if (err < 0)
+                return err;
 
         return 0;
@@ -2066 +2058 @@
                 if (reg.invert)
                         val = reg.mask - val;
-                 ucontrol->value.integer.value[1] = val;
+                ucontrol->value.integer.value[1] = val;
         }
         spin_unlock_irq(&cm->reg_lock);
@@ -2294 +2286 @@
 
 
-static struct snd_kcontrol_new snd_cmipci_mixers[] __devinitdata = {
+static struct snd_kcontrol_new snd_cmipci_mixers[] = {
         CMIPCI_SB_VOL_STEREO("Master Playback Volume", SB_DSP4_MASTER_DEV, 3, 31),
         CMIPCI_MIXER_SW_MONO("3D Control - Switch", CM_REG_MIXER1, CM_X3DEN_SHIFT, 0),
@@ -2616 +2608 @@
 
 /* both for CM8338/8738 */
-static struct snd_kcontrol_new snd_cmipci_mixer_switches[] __devinitdata = {
+static struct snd_kcontrol_new snd_cmipci_mixer_switches[] = {
         DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),
         {
@@ -2628 +2620 @@
 
 /* for non-multichannel chips */
-static struct snd_kcontrol_new snd_cmipci_nomulti_switch __devinitdata =
+static struct snd_kcontrol_new snd_cmipci_nomulti_switch =
 DEFINE_MIXER_SWITCH("Exchange DAC", exchange_dac);
 
 /* only for CM8738 */
-static struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] __devinitdata = {
+static struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] = {
 #if 0 /* controlled in pcm device */
         DEFINE_MIXER_SWITCH("IEC958 In Record", spdif_in),
@@ -2654 +2646 @@
 
 /* only for model 033/037 */
-static struct snd_kcontrol_new snd_cmipci_old_mixer_switches[] __devinitdata = {
+static struct snd_kcontrol_new snd_cmipci_old_mixer_switches[] = {
         DEFINE_MIXER_SWITCH("IEC958 Mix Analog", spdif_dac_out),
         DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase),
@@ -2661 +2653 @@
 
 /* only for model 039 or later */
-static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata = {
+static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] = {
         DEFINE_MIXER_SWITCH("IEC958 In Select", spdif_in_sel2),
         DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase2),
@@ -2674 +2666 @@
 
 /* card control switches */
-static struct snd_kcontrol_new snd_cmipci_modem_switch __devinitdata =
+static struct snd_kcontrol_new snd_cmipci_modem_switch =
 DEFINE_CARD_SWITCH("Modem", modem);
 
 
-static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)
+static int snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)
 {
         struct snd_card *card;
@@ -2787 +2779 @@
  */
 
-#ifdef CONFIG_PROC_FS
 static void snd_cmipci_proc_read(struct snd_info_entry *entry, 
                                  struct snd_info_buffer *buffer)
@@ -2806 +2797 @@
 }
 
-static void __devinit snd_cmipci_proc_init(struct cmipci *cm)
-{
-        struct snd_info_entry *entry;
-
-        if (! snd_card_proc_new(cm->card, "cmipci", &entry))
-                snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);
-}
-#else /* !CONFIG_PROC_FS */
-static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
-#endif
-
-
-static DEFINE_PCI_DEVICE_TABLE(snd_cmipci_ids) = {
+static void snd_cmipci_proc_init(struct cmipci *cm)
+{
+        snd_card_ro_proc_new(cm->card, "cmipci", cm, snd_cmipci_proc_read);
+}
+
+static const struct pci_device_id snd_cmipci_ids[] = {
         {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},
         {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0},
@@ -2832 +2816 @@
  * driver name is modified according to the chip model
  */
-static void __devinit query_chip(struct cmipci *cm)
+static void query_chip(struct cmipci *cm)
 {
         unsigned int detect;
@@ -2881 +2865 @@
 
 #ifdef SUPPORT_JOYSTICK
-static int __devinit snd_cmipci_create_gameport(struct cmipci *cm, int dev)
+static int snd_cmipci_create_gameport(struct cmipci *cm, int dev)
 {
         static int ports[] = { 0x201, 0x200, 0 }; /* FIXME: majority is 0x201? */
@@ -2904 +2888 @@
 
         if (!r) {
-                printk(KERN_WARNING "cmipci: cannot reserve joystick ports\n");
+                dev_warn(cm->card->dev, "cannot reserve joystick ports\n");
                 return -EBUSY;
         }
@@ -2910 +2894 @@
         cm->gameport = gp = gameport_allocate_port();
         if (!gp) {
-                printk(KERN_ERR "cmipci: cannot allocate memory for gameport\n");
+                dev_err(cm->card->dev, "cannot allocate memory for gameport\n");
                 release_and_free_resource(r);
                 return -ENOMEM;
@@ -2974 +2958 @@
 }
 
-static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)
+static int snd_cmipci_create_fm(struct cmipci *cm, long fm_port)
 {
         long iosynth;
@@ -3010 +2994 @@
                 if (snd_opl3_create(cm->card, iosynth, iosynth + 2,
                                     OPL3_HW_OPL3, 0, &opl3) < 0) {
-                        printk(KERN_ERR "cmipci: no OPL device at %#lx, "
-                               "skipping...\n", iosynth);
+                        dev_err(cm->card->dev,
+                                "no OPL device at %#lx, skipping...\n",
+                                iosynth);
                         goto disable_fm;
                 }
         }
         if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                printk(KERN_ERR "cmipci: cannot create OPL3 hwdep\n");
+                dev_err(cm->card->dev, "cannot create OPL3 hwdep\n");
                 return err;
         }
@@ -3027 +3012 @@
 }
 
-static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,
-                                       int dev, struct cmipci **rcmipci)
+static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,
+                             int dev, struct cmipci **rcmipci)
 {
         struct cmipci *cm;
@@ -3040 +3025 @@
         char modelstr[16];
         int pcm_index, pcm_spdif_index;
-        static DEFINE_PCI_DEVICE_TABLE(intel_82437vx) = {
+        static const struct pci_device_id intel_82437vx[] = {
                 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
                 {0},
@@ -3075 +3060 @@
         if (request_irq(pci->irq, snd_cmipci_interrupt,
                         IRQF_SHARED, KBUILD_MODNAME, cm)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                 snd_cmipci_free(cm);
                 return -EBUSY;
@@ -3207 +3192 @@
                         snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_UART_EN);
                         if (inb(iomidi + 1) == 0xff) {
-                                snd_printk(KERN_ERR "cannot enable MPU-401 port"
-                                           " at %#lx\n", iomidi);
+                                dev_err(cm->card->dev,
+                                        "cannot enable MPU-401 port at %#lx\n",
+                                        iomidi);
                                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1,
                                                      CM_UART_EN);
@@ -3252 +3238 @@
                                                MPU401_INFO_IRQ_HOOK,
                                                -1, &cm->rmidi)) < 0) {
-                        printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);
+                        dev_err(cm->card->dev,
+                                "no UART401 device at 0x%lx\n", iomidi);
                 }
         }
@@ -3269 +3256 @@
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
 
-        snd_card_set_dev(card, &pci->dev);
-
         *rcmipci = cm;
         return 0;
@@ -3280 +3265 @@
 MODULE_DEVICE_TABLE(pci, snd_cmipci_ids);
 
-static int __devinit snd_cmipci_probe(struct pci_dev *pci,
-                                      const struct pci_device_id *pci_id)
+static int snd_cmipci_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -3295 +3280 @@
         }
 
-        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;
@@ -3313 +3299 @@
         }
 
-        if ((err = snd_cmipci_create(card, pci, dev, &cm)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_cmipci_create(card, pci, dev, &cm);
+        if (err < 0)
+                goto free_card;
+
         card->private_data = cm;
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_card_register(card);
+        if (err < 0)
+                goto free_card;
+
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
 
-}
-
-static void __devexit snd_cmipci_remove(struct pci_dev *pci)
+free_card:
+        snd_card_free(card);
+        return err;
+}
+
+static void snd_cmipci_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-
-#ifdef CONFIG_PM
+}
+
+
+#ifdef CONFIG_PM_SLEEP
 /*
  * power management
@@ -3359 +3347 @@
 };
 
-static int snd_cmipci_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int snd_cmipci_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct cmipci *cm = card->private_data;
         int i;
@@ -3367 +3355 @@
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         
-        snd_pcm_suspend_all(cm->pcm);
-        snd_pcm_suspend_all(cm->pcm2);
-        snd_pcm_suspend_all(cm->pcm_spdif);
-
         /* save registers */
         for (i = 0; i < ARRAY_SIZE(saved_regs); i++)
@@ -3379 +3363 @@
         /* disable ints */
         snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);
-
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, pci_choose_state(pci, state));
-        return 0;
-}
-
-static int snd_cmipci_resume(struct pci_dev *pci)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+        return 0;
+}
+
+static int snd_cmipci_resume(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct cmipci *cm = 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 "cmipci: pci_enable_device failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
 
         /* reset / initialize to a sane state */
@@ -3417 +3387 @@
         return 0;
 }
-#endif /* CONFIG_PM */
-
-static struct pci_driver driver = {
+
+static SIMPLE_DEV_PM_OPS(snd_cmipci_pm, snd_cmipci_suspend, snd_cmipci_resume);
+#define SND_CMIPCI_PM_OPS       &snd_cmipci_pm
+#else
+#define SND_CMIPCI_PM_OPS       NULL
+#endif /* CONFIG_PM_SLEEP */
+
+static struct pci_driver cmipci_driver = {
         .name = KBUILD_MODNAME,
         .id_table = snd_cmipci_ids,
         .probe = snd_cmipci_probe,
-        .remove = __devexit_p(snd_cmipci_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_cmipci_suspend,
-        .resume = snd_cmipci_resume,
-#endif
+        .remove = snd_cmipci_remove,
+        .driver = {
+                .pm = SND_CMIPCI_PM_OPS,
+        },
 };
         
-static int __init alsa_card_cmipci_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_cmipci_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_cmipci_init)
-module_exit(alsa_card_cmipci_exit)
+module_pci_driver(cmipci_driver);