[ALSA] Remove xxx_t typedefs: PCI CS46xx

[linux-2.6-omap-h63xx.git] / sound / pci / ad1889.c

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d7d99a25c5e53dffb1ac797c62d8ffac2a9db212..999aaeae3fff9641f15dcba83673177f1a7514f9 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -50,7 +50,7 @@
 #include "ad1889.h"
 #include "ac97/ac97_id.h"
 
-#define        AD1889_DRVVER   "$Revision: 1.3 $"
+#define        AD1889_DRVVER   "$Revision: 1.4 $"
 
 MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>");
 MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");
@@ -623,14 +623,6 @@ snd_ad1889_interrupt(int irq,
        return IRQ_HANDLED;
 }
 
-static void 
-snd_ad1889_pcm_free(snd_pcm_t *pcm)
-{
-       struct snd_ad1889 *chip = pcm->private_data;
-       chip->pcm = NULL;
-       snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int __devinit
 snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, snd_pcm_t **rpcm)
 {
@@ -650,7 +642,6 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, snd_pcm_t **rpcm)
                        &snd_ad1889_capture_ops);
 
        pcm->private_data = chip;
-       pcm->private_free = snd_ad1889_pcm_free;
        pcm->info_flags = 0;
        strcpy(pcm->name, chip->card->shortname);
        
@@ -982,8 +973,7 @@ snd_ad1889_create(snd_card_t *card,
        return 0;
 
 free_and_ret:
-       if (chip)
-               kfree(chip);
+       kfree(chip);
        pci_disable_device(pci);
 
        return err;
@@ -1068,7 +1058,6 @@ MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
 
 static struct pci_driver ad1889_pci = {
        .name = "AD1889 Audio",
-       .owner = THIS_MODULE,
        .id_table = snd_ad1889_ids,
        .probe = snd_ad1889_probe,
        .remove = __devexit_p(snd_ad1889_remove),