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

GPL/trunk/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
- */
-
+ */
+ 
 /* Does not work. Warning may block system in capture mode */
 /* #define USE_VAR48KRATE */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -28 +15 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <sound/core.h>
@@ -41 +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");
@@ -49 +39 @@
                 "{C-Media,CMI8338B}}");
 
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+#if IS_REACHABLE(CONFIG_GAMEPORT)
 #define SUPPORT_JOYSTICK 1
 #endif
@@ -55 +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 long mpu_port[SNDRV_CARDS];
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable switches */
 #ifndef TARGET_OS2
+static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
 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 long mpu_port[SNDRV_CARDS] = {0,1,1,1,1,1,1,1};
+static long fm_port[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
@@ -74 +65 @@
 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, "Sofware-conversion of raw SPDIF packets (model 033 only).");
+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
@@ -510 +501 @@
         spinlock_t reg_lock;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         unsigned int saved_regs[0x20];
         unsigned char saved_mixers[0x20];
@@ -605 +596 @@
  */
 
-static unsigned int rates[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 };
+static const unsigned int rates[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 };
 
 static unsigned int snd_cmipci_rate_freq(unsigned int rate)
@@ -662 +653 @@
 
 /*
- * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff
- * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen
+ * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff
+ * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen
  * at the register CM_REG_FUNCTRL1 (0x04).
  * Problem: other ways are also possible (any information about that?)
@@ -672 +663 @@
         /*
          * Guess that this programs at reg. 0x04 the pos 15:13/12:10
-         * for DSFC/ASFC (000 upto 111).
+         * for DSFC/ASFC (000 up to 111).
          */
 
@@ -684 +675 @@
 }
 #endif /* USE_VAR48KRATE */
-
-static int snd_cmipci_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
 
 static int snd_cmipci_playback2_hw_params(struct snd_pcm_substream *substream,
@@ -705 +690 @@
                 mutex_unlock(&cm->open_mutex);
         }
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+        return 0;
 }
 
@@ -716 +701 @@
 }
 
-static int snd_cmipci_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
-
-/*
- */
-
-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,
@@ -802 +782 @@
                 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;
         }
@@ -833 +813 @@
                 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 */
@@ -856 +836 @@
         }
         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 */
@@ -872 +852 @@
         }
         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) {
@@ -910 +890 @@
                 /* 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:
@@ -957 +937 @@
                 if (rem < rec->dma_size)
                         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:
@@ -1051 +1031 @@
 }
 
-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,
@@ -1078 +1058 @@
 }
 
-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,
@@ -1125 +1105 @@
 }
 
-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,
@@ -1145 +1125 @@
                 unsigned int i;
 
-                val = kmalloc(sizeof(*val), GFP_ATOMIC);
+                val = kmalloc(sizeof(*val), GFP_KERNEL);
                 if (!val)
                         return -ENOMEM;
@@ -1308 +1288 @@
                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE &&
                     substream->runtime->channels == 2);
-        if (do_spdif && cm->can_ac3_hw)
+        if (do_spdif && cm->can_ac3_hw) 
                 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO;
         if ((err = setup_spdif_playback(cm, substream, do_spdif, do_ac3)) < 0)
@@ -1321 +1301 @@
         int err, do_ac3;
 
-        if (cm->can_ac3_hw)
+        if (cm->can_ac3_hw) 
                 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO;
         else
@@ -1390 +1370 @@
         restore_mixer_state(cm);
         snd_cmipci_silence_hack(cm, &cm->channel[0]);
-        return snd_cmipci_hw_free(substream);
+        return 0;
 }
 
@@ -1397 +1377 @@
         struct cmipci *cm = snd_pcm_substream_chip(substream);
         snd_cmipci_silence_hack(cm, &cm->channel[1]);
-        return snd_cmipci_hw_free(substream);
+        return 0;
 }
 
@@ -1439 +1419 @@
         spin_unlock_irq(&cm->reg_lock);
 
-        return snd_cmipci_hw_free(subs);
+        return 0;
 }
 
@@ -1483 +1463 @@
 
 /* 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 |
@@ -1503 +1483 @@
 
 /* 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 |
@@ -1523 +1503 @@
 
 /* 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 |
@@ -1543 +1523 @@
 
 /* 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 |
@@ -1563 +1543 @@
 
 /* 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 |
@@ -1583 +1563 @@
 
 /* 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 |
@@ -1603 +1583 @@
 };
 
-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,
@@ -1844 +1824 @@
  */
 
-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,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cmipci_hw_params,
         .hw_free =      snd_cmipci_playback_hw_free,
         .prepare =      snd_cmipci_playback_prepare,
@@ -1855 +1833 @@
 };
 
-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,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cmipci_hw_params,
-        .hw_free =      snd_cmipci_hw_free,
         .prepare =      snd_cmipci_capture_prepare,
         .trigger =      snd_cmipci_capture_trigger,
@@ -1866 +1841 @@
 };
 
-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,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_cmipci_playback2_hw_params,
         .hw_free =      snd_cmipci_playback2_hw_free,
@@ -1877 +1851 @@
 };
 
-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,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cmipci_hw_params,
         .hw_free =      snd_cmipci_playback_hw_free,
         .prepare =      snd_cmipci_playback_spdif_prepare,      /* set up rate */
@@ -1888 +1860 @@
 };
 
-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,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cmipci_hw_params,
         .hw_free =      snd_cmipci_capture_spdif_hw_free,
         .prepare =      snd_cmipci_capture_spdif_prepare,
@@ -1903 +1873 @@
  */
 
-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;
@@ -1920 +1890 @@
         cm->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(cm->pci), 64*1024, 128*1024);
-
-        return 0;
-}
-
-static int __devinit snd_cmipci_pcm2_new(struct cmipci *cm, int device)
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &cm->pci->dev, 64*1024, 128*1024);
+
+        return 0;
+}
+
+static int snd_cmipci_pcm2_new(struct cmipci *cm, int device)
 {
         struct snd_pcm *pcm;
@@ -1942 +1912 @@
         cm->pcm2 = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(cm->pci), 64*1024, 128*1024);
-
-        return 0;
-}
-
-static int __devinit snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &cm->pci->dev, 64*1024, 128*1024);
+
+        return 0;
+}
+
+static int snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)
 {
         struct snd_pcm *pcm;
@@ -1965 +1935 @@
         cm->pcm_spdif = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(cm->pci), 64*1024, 128*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &cm->pci->dev, 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;
@@ -2044 +2020 @@
         return 0;
 }
-
+ 
 static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
@@ -2062 +2038 @@
                 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);
@@ -2126 +2102 @@
         return 0;
 }
-
+ 
 static int snd_cmipci_get_input_sw(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
@@ -2290 +2266 @@
 
 
-static struct snd_kcontrol_new snd_cmipci_mixers[] __devinitdata = {
+static const 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),
@@ -2394 +2370 @@
         else
                 val = snd_cmipci_read(cm, args->reg);
-        change = (val & args->mask) != (ucontrol->value.integer.value[0] ?
+        change = (val & args->mask) != (ucontrol->value.integer.value[0] ? 
                         args->mask_on : (args->mask & ~args->mask_on));
         if (change) {
@@ -2590 +2566 @@
         /* same bit as spdi_phase */
         spin_lock_irq(&cm->reg_lock);
-        ucontrol->value.enumerated.item[0] =
+        ucontrol->value.enumerated.item[0] = 
                 (snd_cmipci_read_b(cm, CM_REG_MISC) & CM_SPDIF_INVERSE) ? 1 : 0;
         spin_unlock_irq(&cm->reg_lock);
@@ -2612 +2588 @@
 
 /* both for CM8338/8738 */
-static struct snd_kcontrol_new snd_cmipci_mixer_switches[] __devinitdata = {
+static const struct snd_kcontrol_new snd_cmipci_mixer_switches[] = {
         DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),
         {
@@ -2624 +2600 @@
 
 /* for non-multichannel chips */
-static struct snd_kcontrol_new snd_cmipci_nomulti_switch __devinitdata =
+static const 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 const struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] = {
 #if 0 /* controlled in pcm device */
         DEFINE_MIXER_SWITCH("IEC958 In Record", spdif_in),
@@ -2650 +2626 @@
 
 /* only for model 033/037 */
-static struct snd_kcontrol_new snd_cmipci_old_mixer_switches[] __devinitdata = {
+static const 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),
@@ -2657 +2633 @@
 
 /* only for model 039 or later */
-static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata = {
+static const 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),
@@ -2670 +2646 @@
 
 /* card control switches */
-static struct snd_kcontrol_new snd_cmipci_modem_switch __devinitdata =
+static const 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;
-        struct snd_kcontrol_new *sw;
+        const struct snd_kcontrol_new *sw;
         struct snd_kcontrol *kctl;
         unsigned int idx;
@@ -2783 +2759 @@
  */
 
-#ifdef CONFIG_PROC_FS
-static void snd_cmipci_proc_read(struct snd_info_entry *entry,
+static void snd_cmipci_proc_read(struct snd_info_entry *entry, 
                                  struct snd_info_buffer *buffer)
 {
@@ -2802 +2777 @@
 }
 
-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},
@@ -2828 +2796 @@
  * 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;
@@ -2877 +2845 @@
 
 #ifdef SUPPORT_JOYSTICK
-static int __devinit snd_cmipci_create_gameport(struct cmipci *cm, int dev)
-{
-        static int ports[] = { 0x201, 0x200, 0 }; /* FIXME: majority is 0x201? */
+static int snd_cmipci_create_gameport(struct cmipci *cm, int dev)
+{
+        static const int ports[] = { 0x201, 0x200, 0 }; /* FIXME: majority is 0x201? */
         struct gameport *gp;
         struct resource *r = NULL;
@@ -2900 +2868 @@
 
         if (!r) {
-                printk(KERN_WARNING "cmipci: cannot reserve joystick ports\n");
+                dev_warn(cm->card->dev, "cannot reserve joystick ports\n");
                 return -EBUSY;
         }
@@ -2906 +2874 @@
         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;
@@ -2970 +2938 @@
 }
 
-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;
@@ -3006 +2974 @@
                 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;
         }
@@ -3023 +2992 @@
 }
 
-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;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_cmipci_dev_free,
         };
@@ -3036 +3005 @@
         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},
@@ -3070 +3039 @@
 
         if (request_irq(pci->irq, snd_cmipci_interrupt,
-                        IRQF_SHARED, card->driver, cm)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                        IRQF_SHARED, KBUILD_MODNAME, cm)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                 snd_cmipci_free(cm);
                 return -EBUSY;
         }
         cm->irq = pci->irq;
+        card->sync_irq = cm->irq;
 
         pci_set_master(cm->pci);
@@ -3133 +3103 @@
         case PCI_DEVICE_ID_CMEDIA_CM8738:
         case PCI_DEVICE_ID_CMEDIA_CM8738B:
-                if (!pci_dev_present(intel_82437vx))
+                if (!pci_dev_present(intel_82437vx)) 
                         snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
                 break;
@@ -3183 +3153 @@
                 val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);
                 if (val != 0x00 && val != 0xff) {
-                        iomidi = cm->iobase + CM_REG_MPU_PCI;
+                        if (mpu_port[dev])
+                                iomidi = cm->iobase + CM_REG_MPU_PCI;
                         integrated_midi = 1;
                 }
@@ -3203 +3174 @@
                         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);
@@ -3245 +3217 @@
                                                iomidi,
                                                (integrated_midi ?
-                                                MPU401_INFO_INTEGRATED : 0),
-                                               cm->irq, 0, &cm->rmidi)) < 0) {
-                        printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);
+                                                MPU401_INFO_INTEGRATED : 0) |
+                                               MPU401_INFO_IRQ_HOOK,
+                                               -1, &cm->rmidi)) < 0) {
+                        dev_err(cm->card->dev,
+                                "no UART401 device at 0x%lx\n", iomidi);
                 }
         }
@@ -3264 +3238 @@
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
 
-        snd_card_set_dev(card, &pci->dev);
-
         *rcmipci = cm;
         return 0;
@@ -3275 +3247 @@
 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;
@@ -3290 +3262 @@
         }
 
-        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;
@@ -3308 +3281 @@
         }
 
-        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
  */
-static unsigned char saved_regs[] = {
+static const unsigned char saved_regs[] = {
         CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,
         CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL,
@@ -3343 +3318 @@
 };
 
-static unsigned char saved_mixers[] = {
+static const unsigned char saved_mixers[] = {
         SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,
         SB_DSP4_PCM_DEV, SB_DSP4_PCM_DEV + 1,
@@ -3354 +3329 @@
 };
 
-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;
@@ -3362 +3337 @@
         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++)
@@ -3374 +3345 @@
         /* 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 */
@@ -3412 +3369 @@
         return 0;
 }
-#endif /* CONFIG_PM */
-
-static struct pci_driver driver = {
-        .name = "C-Media PCI",
+
+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);