vserver 1.9.5.x5

[linux-2.6.git] / sound / pci / vx222 / vx222.c

diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 9f4ef46..4ffbb25 100644 (file)
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -28,38 +28,29 @@
 #include <sound/initval.h>
 #include "vx222.h"
 
-#define chip_t vx_core_t
-
 #define CARD_NAME "VX222"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("Digigram VX222 V2/Mic");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{Digigram," CARD_NAME "}}");
+MODULE_SUPPORTED_DEVICE("{{Digigram," CARD_NAME "}}");
 
 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 this card */
 static int mic[SNDRV_CARDS]; /* microphone */
 static int ibl[SNDRV_CARDS]; /* microphone */
-static int boot_devs;
 
-module_param_array(index, int, boot_devs, 0444);
+module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-module_param_array(id, charp, boot_devs, 0444);
+module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Digigram " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-module_param_array(enable, bool, boot_devs, 0444);
+module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-module_param_array(mic, bool, boot_devs, 0444);
+module_param_array(mic, bool, NULL, 0444);
 MODULE_PARM_DESC(mic, "Enable Microphone.");
-MODULE_PARM_SYNTAX(mic, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-module_param_array(ibl, int, boot_devs, 0444);
+module_param_array(ibl, int, NULL, 0444);
 MODULE_PARM_DESC(ibl, "Capture IBL size.");
-MODULE_PARM_SYNTAX(ibl, SNDRV_ENABLED);
 
 /*
  */
@@ -70,8 +61,8 @@ enum {
 };
 
 static struct pci_device_id snd_vx222_ids[] = {
-       { 0x10b5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, },   /* PLX */
-       { 0x10b5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, },   /* PLX */
+       { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, },   /* PLX */
+       { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, },   /* PLX */
        { 0, }
 };
 
@@ -119,24 +110,20 @@ static struct snd_vx_hardware vx222_mic_hw = {
  */
 static int snd_vx222_free(vx_core_t *chip)
 {
-       int i;
        struct snd_vx222 *vx = (struct snd_vx222 *)chip;
 
        if (chip->irq >= 0)
                free_irq(chip->irq, (void*)chip);
-       for (i = 0; i < 2; i++) {
-               if (vx->port_res[i]) {
-                       release_resource(vx->port_res[i]);
-                       kfree_nocheck(vx->port_res[i]);
-               }
-       }
-       snd_magic_kfree(chip);
+       if (vx->port[0])
+               pci_release_regions(vx->pci);
+       pci_disable_device(vx->pci);
+       kfree(chip);
        return 0;
 }
 
 static int snd_vx222_dev_free(snd_device_t *device)
 {
-       vx_core_t *chip = snd_magic_cast(vx_core_t, device->device_data, return -ENXIO);
+       vx_core_t *chip = device->device_data;
        return snd_vx222_free(chip);
 }
 
@@ -161,24 +148,19 @@ static int __devinit snd_vx222_create(snd_card_t *card, struct pci_dev *pci,
        vx_ops = hw->type == VX_TYPE_BOARD ? &vx222_old_ops : &vx222_ops;
        chip = snd_vx_create(card, hw, vx_ops,
                             sizeof(struct snd_vx222) - sizeof(vx_core_t));
-       if (! chip)
+       if (! chip) {
+               pci_disable_device(pci);
                return -ENOMEM;
+       }
        vx = (struct snd_vx222 *)chip;
+       vx->pci = pci;
 
-       for (i = 0; i < 2; i++) {
-               if (!(pci_resource_flags(pci, i + 1) & IORESOURCE_IO)) {
-                       snd_printk(KERN_ERR "invalid i/o resource %d\n", i + 1);
-                       snd_vx222_free(chip);
-                       return -ENOMEM;
-               }
-               vx->port[i] = pci_resource_start(pci, i + 1);
-               if ((vx->port_res[i] = request_region(vx->port[i], 0x60,
-                                                     CARD_NAME)) == NULL) {
-                       snd_printk(KERN_ERR "unable to grab port 0x%lx\n", vx->port[i]);
-                       snd_vx222_free(chip);
-                       return -EBUSY;
-               }
+       if ((err = pci_request_regions(pci, CARD_NAME)) < 0) {
+               snd_vx222_free(chip);
+               return err;
        }
+       for (i = 0; i < 2; i++)
+               vx->port[i] = pci_resource_start(pci, i + 1);
 
        if (request_irq(pci->irq, snd_vx_irq_handler, SA_INTERRUPT|SA_SHIRQ,
                        CARD_NAME, (void *) chip)) {
@@ -243,7 +225,11 @@ static int __devinit snd_vx222_probe(struct pci_dev *pci,
        snd_printdd("%s at 0x%lx & 0x%lx, irq %i\n",
                    card->shortname, vx->port[0], vx->port[1], vx->core.irq);
 
-       if ((err = snd_vx_hwdep_new(&vx->core)) < 0) {
+#ifdef SND_VX_FW_LOADER
+       vx->core.dev = &pci->dev;
+#endif
+
+       if ((err = snd_vx_setup_firmware(&vx->core)) < 0) {
                snd_card_free(card);
                return err;
        }
@@ -269,6 +255,7 @@ static struct pci_driver driver = {
        .id_table = snd_vx222_ids,
        .probe = snd_vx222_probe,
        .remove = __devexit_p(snd_vx222_remove),
+       SND_PCI_PM_CALLBACKS
 };
 
 static int __init alsa_card_vx222_init(void)