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

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
@@ -14 +15 @@
  *    - EMU10K1X-DBQ
  *    - STAC 9708T
- *
- *   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
- *
  */
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "emu10k1"
+#endif
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -35 +24 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -51 +40 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
@@ -108 +97 @@
 /********************************************************************************************************/
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
-                                                /* One list entry: 4 bytes for DMA address,
+                                                /* One list entry: 4 bytes for DMA address, 
                                                  * 4 bytes for period_size << 16.
                                                  * One list entry is 8 bytes long.
@@ -181 +170 @@
 /* From 0x50 - 0x5f, last samples captured */
 
-/**
+/*
  * The hardware has 3 channels for playback and 1 for capture.
  *  - channel 0 is the front channel
@@ -187 +176 @@
  *  - channel 2 is the center/lfe channel
  * Volume is controlled by the AC97 for the front and rear channels by
- * the PCM Playback Volume, Sigmatel Surround Playback Volume and
+ * the PCM Playback Volume, Sigmatel Surround Playback Volume and 
  * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects
  * the front/rear channel mixing in the REAR OUT jack. When using the
@@ -200 +189 @@
         int number;
         int use;
-
+  
         struct emu10k1x_pcm *epcm;
 };
@@ -255 +244 @@
 
 /* hardware definition */
-static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP |
+static const struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -274 +263 @@
 };
 
-static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP |
+static const struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -293 +282 @@
 };
 
-static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,
-                                          unsigned int reg,
+static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu, 
+                                          unsigned int reg, 
                                           unsigned int chn)
 {
         unsigned long flags;
         unsigned int regptr, val;
-
+  
         regptr = (reg << 16) | chn;
 
@@ -370 +359 @@
                 return;
 #if 0
-        snd_printk(KERN_INFO "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
+        dev_info(emu->card->dev,
+                 "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
                    epcm->substream->ops->pointer(epcm->substream),
                    snd_pcm_lib_period_bytes(epcm->substream),
@@ -397 +387 @@
         epcm->emu = chip;
         epcm->substream = substream;
-
+  
         runtime->private_data = epcm;
         runtime->private_free = snd_emu10k1x_pcm_free_substream;
-
+  
         runtime->hw = snd_emu10k1x_playback_hw;
 
@@ -425 +415 @@
         }
 
-        return snd_pcm_lib_malloc_pages(substream,
-                                        params_buffer_bytes(hw_params));
+        return 0;
 }
 
@@ -446 +435 @@
         }
 
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -488 +477 @@
         int result = 0;
 
-//      snd_printk(KERN_INFO "trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n", (int)emu, cmd, (int)substream->ops->pointer(substream));
+        /*
+        dev_dbg(emu->card->dev,
+                "trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n",
+                (int)emu, cmd, (int)substream->ops->pointer(substream));
+        */
 
         switch (cmd) {
@@ -531 +524 @@
                 return 0;
         
-        if (ptr3 != ptr4)
+        if (ptr3 != ptr4) 
                 ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
         ptr2 = bytes_to_frames(runtime, ptr1);
@@ -544 +537 @@
 
 /* operators */
-static struct snd_pcm_ops snd_emu10k1x_playback_ops = {
+static const struct snd_pcm_ops snd_emu10k1x_playback_ops = {
         .open =        snd_emu10k1x_playback_open,
         .close =       snd_emu10k1x_playback_close,
-        .ioctl =       snd_pcm_lib_ioctl,
         .hw_params =   snd_emu10k1x_pcm_hw_params,
         .hw_free =     snd_emu10k1x_pcm_hw_free,
@@ -604 +596 @@
         }
 
-        return snd_pcm_lib_malloc_pages(substream,
-                                        params_buffer_bytes(hw_params));
+        return 0;
 }
 
@@ -625 +616 @@
         }
 
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -653 +644 @@
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP |
+                snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP | 
                                          INTE_CAP_0_HALF_LOOP);
                 snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|TRIGGER_CAPTURE);
@@ -660 +651 @@
         case SNDRV_PCM_TRIGGER_STOP:
                 epcm->running = 0;
-                snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP |
+                snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP | 
                                           INTE_CAP_0_HALF_LOOP);
                 snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CAPTURE));
@@ -690 +681 @@
 }
 
-static struct snd_pcm_ops snd_emu10k1x_capture_ops = {
+static const struct snd_pcm_ops snd_emu10k1x_capture_ops = {
         .open =        snd_emu10k1x_pcm_open_capture,
         .close =       snd_emu10k1x_pcm_close_capture,
-        .ioctl =       snd_pcm_lib_ioctl,
         .hw_params =   snd_emu10k1x_pcm_hw_params_capture,
         .hw_free =     snd_emu10k1x_pcm_hw_free_capture,
@@ -707 +697 @@
         unsigned long flags;
         unsigned short val;
-
+  
         spin_lock_irqsave(&emu->emu_lock, flags);
         outb(reg, emu->port + AC97ADDRESS);
@@ -720 +710 @@
         struct emu10k1x *emu = ac97->private_data;
         unsigned long flags;
-
+  
         spin_lock_irqsave(&emu->emu_lock, flags);
         outb(reg, emu->port + AC97ADDRESS);
@@ -732 +722 @@
         struct snd_ac97_template ac97;
         int err;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_emu10k1x_ac97_write,
                 .read = snd_emu10k1x_ac97_read,
         };
-
+  
         if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
                 return err;
@@ -799 +789 @@
                 if (cap_voice->use)
                         snd_emu10k1x_pcm_interrupt(chip, cap_voice);
-                else
-                        snd_emu10k1x_intr_disable(chip,
+                else 
+                        snd_emu10k1x_intr_disable(chip, 
                                                   INTE_CAP_0_LOOP |
                                                   INTE_CAP_0_HALF_LOOP);
@@ -827 +817 @@
         outl(status, chip->port + IPR);
 
-        // snd_printk(KERN_INFO "interrupt %08x\n", status);
+        /* dev_dbg(chip->card->dev, "interrupt %08x\n", status); */
         return IRQ_HANDLED;
 }
 
-static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)
+static const struct snd_pcm_chmap_elem surround_map[] = {
+        { .channels = 2,
+          .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
+        {0}
+};
+
+static const struct snd_pcm_chmap_elem clfe_map[] = {
+        { .channels = 2,
+          .map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },
+        {0}
+};
+
+static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device)
 {
         struct snd_pcm *pcm;
+        const struct snd_pcm_chmap_elem *map = NULL;
         int err;
         int capture = 0;
-
-        if (rpcm)
-                *rpcm = NULL;
+  
         if (device == 0)
                 capture = 1;
@@ -844 +845 @@
         if ((err = snd_pcm_new(emu->card, "emu10k1x", device, 1, capture, &pcm)) < 0)
                 return err;
-
+  
         pcm->private_data = emu;
         
@@ -862 +863 @@
         case 0:
                 strcpy(pcm->name, "EMU10K1X Front");
+                map = snd_pcm_std_chmaps;
                 break;
         case 1:
                 strcpy(pcm->name, "EMU10K1X Rear");
+                map = surround_map;
                 break;
         case 2:
                 strcpy(pcm->name, "EMU10K1X Center/LFE");
+                map = clfe_map;
                 break;
         }
         emu->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(emu->pci),
-                                              32*1024, 32*1024);
-
-        if (rpcm)
-                *rpcm = pcm;
-
-        return 0;
-}
-
-static int __devinit snd_emu10k1x_create(struct snd_card *card,
-                                         struct pci_dev *pci,
-                                         struct emu10k1x **rchip)
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &emu->pci->dev, 32*1024, 32*1024);
+  
+        return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,
+                                     1 << 2, NULL);
+}
+
+static int snd_emu10k1x_create(struct snd_card *card,
+                               struct pci_dev *pci,
+                               struct emu10k1x **rchip)
 {
         struct emu10k1x *chip;
         int err;
         int ch;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free = snd_emu10k1x_dev_free,
         };
@@ -899 +900 @@
         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 "error to set 28bit mask DMA\n");
+                dev_err(card->dev, "error to set 28bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
@@ -916 +917 @@
         spin_lock_init(&chip->emu_lock);
         spin_lock_init(&chip->voice_lock);
-
+  
         chip->port = pci_resource_start(pci, 0);
         if ((chip->res_port = request_region(chip->port, 8,
-                                             "EMU10K1X")) == NULL) {
-                snd_printk(KERN_ERR "emu10k1x: cannot allocate the port 0x%lx\n", chip->port);
+                                             "EMU10K1X")) == NULL) { 
+                dev_err(card->dev, "cannot allocate the port 0x%lx\n",
+                        chip->port);
                 snd_emu10k1x_free(chip);
                 return -EBUSY;
@@ -926 +928 @@
 
         if (request_irq(pci->irq, snd_emu10k1x_interrupt,
-                        IRQF_SHARED, "EMU10K1X", chip)) {
-                snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
+                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
+                dev_err(card->dev, "cannot grab irq %d\n", pci->irq);
                 snd_emu10k1x_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
-
-        if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                               4 * 1024, &chip->dma_buffer) < 0) {
+        card->sync_irq = chip->irq;
+  
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
+                                4 * 1024, &chip->dma_buffer) < 0) {
                 snd_emu10k1x_free(chip);
                 return -ENOMEM;
@@ -948 +951 @@
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
-        snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
+        dev_info(card->dev, "Model %04x Rev %08x Serial %08x\n", chip->model,
                    chip->revision, chip->serial);
 
@@ -973 +976 @@
          */
         snd_emu10k1x_ptr_write(chip, SPCS0, 0,
-                               chip->spdif_bits[0] =
+                               chip->spdif_bits[0] = 
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -979 +982 @@
                                0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
         snd_emu10k1x_ptr_write(chip, SPCS1, 0,
-                               chip->spdif_bits[1] =
+                               chip->spdif_bits[1] = 
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -985 +988 @@
                                0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
         snd_emu10k1x_ptr_write(chip, SPCS2, 0,
-                               chip->spdif_bits[2] =
+                               chip->spdif_bits[2] = 
                                SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
                                SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
@@ -1006 +1009 @@
 }
 
-static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,
+static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry, 
                                        struct snd_info_buffer *buffer)
 {
@@ -1034 +1037 @@
 }
 
-static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
+static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, 
                                         struct snd_info_buffer *buffer)
 {
@@ -1045 +1048 @@
                         continue;
 
-                if (reg < 0x49 && /* val <= 0xffffffff && DAZ */ channel_id <= 2)
+                if (reg < 0x49 && channel_id <= 2)
                         snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
         }
 }
 
-static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
-{
-        struct snd_info_entry *entry;
-        
-        if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
-                snd_info_set_text_ops(entry, emu, snd_emu10k1x_proc_reg_read);
-                entry->c.text.write = snd_emu10k1x_proc_reg_write;
-                entry->mode |= S_IWUSR;
-                entry->private_data = emu;
-        }
-        
+static int snd_emu10k1x_proc_init(struct emu10k1x *emu)
+{
+        snd_card_rw_proc_new(emu->card, "emu10k1x_regs", emu,
+                             snd_emu10k1x_proc_reg_read,
+                             snd_emu10k1x_proc_reg_write);
         return 0;
 }
@@ -1081 +1078 @@
         struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
         unsigned int val;
-        int change = 0;
 
         val = ucontrol->value.integer.value[0] ;
@@ -1096 +1092 @@
                 snd_emu10k1x_gpio_write(emu, 0x1080);
         }
-        return change;
-}
-
-static struct snd_kcontrol_new snd_emu10k1x_shared_spdif __devinitdata =
+        return 0;
+}
+
+static const struct snd_kcontrol_new snd_emu10k1x_shared_spdif =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1158 +1154 @@
 }
 
-static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =
+static const struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =
 {
         .access =       SNDRV_CTL_ELEM_ACCESS_READ,
@@ -1168 +1164 @@
 };
 
-static struct snd_kcontrol_new snd_emu10k1x_spdif_control =
+static const struct snd_kcontrol_new snd_emu10k1x_spdif_control =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
@@ -1178 +1174 @@
 };
 
-static int __devinit snd_emu10k1x_mixer(struct emu10k1x *emu)
+static int snd_emu10k1x_mixer(struct emu10k1x *emu)
 {
         int err;
@@ -1232 +1228 @@
 #ifdef CONFIG_SND_DEBUG
         if (timeout <= 0)
-                snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));
+                dev_err(emu->card->dev,
+                        "cmd: clear rx timeout (status = 0x%x)\n",
+                        mpu401_read_stat(emu, mpu));
 #endif
 }
@@ -1306 +1304 @@
         spin_unlock_irqrestore(&midi->input_lock, flags);
         if (!ok) {
-                snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
+                dev_err(emu->card->dev,
+                        "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
                            cmd, emu->port,
                            mpu401_read_stat(emu, midi),
@@ -1470 +1469 @@
  */
 
-static struct snd_rawmidi_ops snd_emu10k1x_midi_output =
+static const struct snd_rawmidi_ops snd_emu10k1x_midi_output =
 {
         .open =         snd_emu10k1x_midi_output_open,
@@ -1477 +1476 @@
 };
 
-static struct snd_rawmidi_ops snd_emu10k1x_midi_input =
+static const struct snd_rawmidi_ops snd_emu10k1x_midi_input =
 {
         .open =         snd_emu10k1x_midi_input_open,
@@ -1491 +1490 @@
 }
 
-static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,
-                                        struct emu10k1x_midi *midi, int device, char *name)
+static int emu10k1x_midi_init(struct emu10k1x *emu,
+                              struct emu10k1x_midi *midi, int device,
+                              char *name)
 {
         struct snd_rawmidi *rmidi;
@@ -1515 +1515 @@
 }
 
-static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)
+static int snd_emu10k1x_midi(struct emu10k1x *emu)
 {
         struct emu10k1x_midi *midi = &emu->midi;
@@ -1532 +1532 @@
 }
 
-static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
-                                        const struct pci_device_id *pci_id)
+static int snd_emu10k1x_probe(struct pci_dev *pci,
+                              const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -1547 +1547 @@
         }
 
-        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;
@@ -1556 +1557 @@
         }
 
-        if ((err = snd_emu10k1x_pcm(chip, 0, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 0)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_emu10k1x_pcm(chip, 1, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 1)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_emu10k1x_pcm(chip, 2, NULL)) < 0) {
+        if ((err = snd_emu10k1x_pcm(chip, 2)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -1591 +1592 @@
                 card->shortname, chip->port, chip->irq);
 
-        snd_card_set_dev(card, &pci->dev);
-
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);
@@ -1603 +1602 @@
 }
 
-static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)
+static void snd_emu10k1x_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
 }
 
 // PCI IDs
-static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = {
+static const struct pci_device_id snd_emu10k1x_ids[] = {
         { PCI_VDEVICE(CREATIVE, 0x0006), 0 },   /* Dell OEM version (EMU10K1) */
         { 0, }
@@ -1617 +1615 @@
 
 // pci_driver definition
-static struct pci_driver driver = {
-        .name = "EMU10K1X",
+static struct pci_driver emu10k1x_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_emu10k1x_ids,
         .probe = snd_emu10k1x_probe,
-        .remove = __devexit_p(snd_emu10k1x_remove),
+        .remove = snd_emu10k1x_remove,
 };
 
-// initialization of the module
-static int __init alsa_card_emu10k1x_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-// clean up the module
-static void __exit alsa_card_emu10k1x_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_emu10k1x_init)
-module_exit(alsa_card_emu10k1x_exit)
+module_pci_driver(emu10k1x_driver);