[ALSA] ad1816a - Fix PCM trigger direction
[linux-2.6.git] / sound / isa / ad1816a / ad1816a_lib.c
index 625b2eff14a14d03f39c17902a448b974b3b8f13..fd8fe16c09ee02a6409375c92d132dc9cd9daaaa 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
     ad1816a.c - lowlevel code for Analog Devices AD1816A chip.
     Copyright (C) 1999-2000 by Massimo Piccioni <dafastidio@libero.it>
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Massimo Piccioni <dafastidio@libero.it>");
-MODULE_DESCRIPTION("lowlevel code for Analog Devices AD1816A chip");
-MODULE_LICENSE("GPL");
-
-static inline int snd_ad1816a_busy_wait(ad1816a_t *chip)
+static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)
 {
        int timeout;
 
@@ -46,34 +41,34 @@ static inline int snd_ad1816a_busy_wait(ad1816a_t *chip)
        return -EBUSY;
 }
 
-static inline unsigned char snd_ad1816a_in(ad1816a_t *chip, unsigned char reg)
+static inline unsigned char snd_ad1816a_in(struct snd_ad1816a *chip, unsigned char reg)
 {
        snd_ad1816a_busy_wait(chip);
        return inb(AD1816A_REG(reg));
 }
 
-static inline void snd_ad1816a_out(ad1816a_t *chip, unsigned char reg,
+static inline void snd_ad1816a_out(struct snd_ad1816a *chip, unsigned char reg,
                            unsigned char value)
 {
        snd_ad1816a_busy_wait(chip);
        outb(value, AD1816A_REG(reg));
 }
 
-static inline void snd_ad1816a_out_mask(ad1816a_t *chip, unsigned char reg,
+static inline void snd_ad1816a_out_mask(struct snd_ad1816a *chip, unsigned char reg,
                                 unsigned char mask, unsigned char value)
 {
        snd_ad1816a_out(chip, reg,
                (value & mask) | (snd_ad1816a_in(chip, reg) & ~mask));
 }
 
-static unsigned short snd_ad1816a_read(ad1816a_t *chip, unsigned char reg)
+static unsigned short snd_ad1816a_read(struct snd_ad1816a *chip, unsigned char reg)
 {
        snd_ad1816a_out(chip, AD1816A_INDIR_ADDR, reg & 0x3f);
        return snd_ad1816a_in(chip, AD1816A_INDIR_DATA_LOW) |
                (snd_ad1816a_in(chip, AD1816A_INDIR_DATA_HIGH) << 8);
 }
 
-static void snd_ad1816a_write(ad1816a_t *chip, unsigned char reg,
+static void snd_ad1816a_write(struct snd_ad1816a *chip, unsigned char reg,
                              unsigned short value)
 {
        snd_ad1816a_out(chip, AD1816A_INDIR_ADDR, reg & 0x3f);
@@ -81,7 +76,7 @@ static void snd_ad1816a_write(ad1816a_t *chip, unsigned char reg,
        snd_ad1816a_out(chip, AD1816A_INDIR_DATA_HIGH, (value >> 8) & 0xff);
 }
 
-static void snd_ad1816a_write_mask(ad1816a_t *chip, unsigned char reg,
+static void snd_ad1816a_write_mask(struct snd_ad1816a *chip, unsigned char reg,
                                   unsigned short mask, unsigned short value)
 {
        snd_ad1816a_write(chip, reg,
@@ -89,7 +84,7 @@ static void snd_ad1816a_write_mask(ad1816a_t *chip, unsigned char reg,
 }
 
 
-static unsigned char snd_ad1816a_get_format(ad1816a_t *chip,
+static unsigned char snd_ad1816a_get_format(struct snd_ad1816a *chip,
                                            unsigned int format, int channels)
 {
        unsigned char retval = AD1816A_FMT_LINEAR_8;
@@ -110,7 +105,7 @@ static unsigned char snd_ad1816a_get_format(ad1816a_t *chip,
        return (channels > 1) ? (retval | AD1816A_FMT_STEREO) : retval;
 }
 
-static int snd_ad1816a_open(ad1816a_t *chip, unsigned int mode)
+static int snd_ad1816a_open(struct snd_ad1816a *chip, unsigned int mode)
 {
        unsigned long flags;
 
@@ -146,7 +141,7 @@ static int snd_ad1816a_open(ad1816a_t *chip, unsigned int mode)
        return 0;
 }
 
-static void snd_ad1816a_close(ad1816a_t *chip, unsigned int mode)
+static void snd_ad1816a_close(struct snd_ad1816a *chip, unsigned int mode)
 {
        unsigned long flags;
 
@@ -178,8 +173,8 @@ static void snd_ad1816a_close(ad1816a_t *chip, unsigned int mode)
 }
 
 
-static int snd_ad1816a_trigger(ad1816a_t *chip, unsigned char what,
-                              int channel, int cmd)
+static int snd_ad1816a_trigger(struct snd_ad1816a *chip, unsigned char what,
+                              int channel, int cmd, int iscapture)
 {
        int error = 0;
 
@@ -188,10 +183,14 @@ static int snd_ad1816a_trigger(ad1816a_t *chip, unsigned char what,
        case SNDRV_PCM_TRIGGER_STOP:
                spin_lock(&chip->lock);
                cmd = (cmd == SNDRV_PCM_TRIGGER_START) ? 0xff: 0x00;
-               if (what & AD1816A_PLAYBACK_ENABLE)
+               /* if (what & AD1816A_PLAYBACK_ENABLE) */
+               /* That is not valid, because playback and capture enable
+                * are the same bit pattern, just to different addresses
+                */
+               if (! iscapture)
                        snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,
                                AD1816A_PLAYBACK_ENABLE, cmd);
-               if (what & AD1816A_CAPTURE_ENABLE)
+               else
                        snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG,
                                AD1816A_CAPTURE_ENABLE, cmd);
                spin_unlock(&chip->lock);
@@ -204,37 +203,37 @@ static int snd_ad1816a_trigger(ad1816a_t *chip, unsigned char what,
        return error;
 }
 
-static int snd_ad1816a_playback_trigger(snd_pcm_substream_t *substream, int cmd)
+static int snd_ad1816a_playback_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        return snd_ad1816a_trigger(chip, AD1816A_PLAYBACK_ENABLE,
-               SNDRV_PCM_STREAM_PLAYBACK, cmd);
+                                  SNDRV_PCM_STREAM_PLAYBACK, cmd, 0);
 }
 
-static int snd_ad1816a_capture_trigger(snd_pcm_substream_t *substream, int cmd)
+static int snd_ad1816a_capture_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        return snd_ad1816a_trigger(chip, AD1816A_CAPTURE_ENABLE,
-               SNDRV_PCM_STREAM_CAPTURE, cmd);
+                                  SNDRV_PCM_STREAM_CAPTURE, cmd, 1);
 }
 
-static int snd_ad1816a_hw_params(snd_pcm_substream_t * substream,
-                                snd_pcm_hw_params_t * hw_params)
+static int snd_ad1816a_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_ad1816a_hw_free(snd_pcm_substream_t * substream)
+static int snd_ad1816a_hw_free(struct snd_pcm_substream *substream)
 {
        return snd_pcm_lib_free_pages(substream);
 }
 
-static int snd_ad1816a_playback_prepare(snd_pcm_substream_t *substream)
+static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        unsigned long flags;
-       snd_pcm_runtime_t *runtime = substream->runtime;
-       unsigned int size;
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       unsigned int size, rate;
 
        spin_lock_irqsave(&chip->lock, flags);
 
@@ -245,7 +244,10 @@ static int snd_ad1816a_playback_prepare(snd_pcm_substream_t *substream)
        snd_dma_program(chip->dma1, runtime->dma_addr, size,
                        DMA_MODE_WRITE | DMA_AUTOINIT);
 
-       snd_ad1816a_write(chip, AD1816A_PLAYBACK_SAMPLE_RATE, runtime->rate);
+       rate = runtime->rate;
+       if (chip->clock_freq)
+               rate = (rate * 33000) / chip->clock_freq;
+       snd_ad1816a_write(chip, AD1816A_PLAYBACK_SAMPLE_RATE, rate);
        snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,
                AD1816A_FMT_ALL | AD1816A_FMT_STEREO,
                snd_ad1816a_get_format(chip, runtime->format,
@@ -258,12 +260,12 @@ static int snd_ad1816a_playback_prepare(snd_pcm_substream_t *substream)
        return 0;
 }
 
-static int snd_ad1816a_capture_prepare(snd_pcm_substream_t *substream)
+static int snd_ad1816a_capture_prepare(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        unsigned long flags;
-       snd_pcm_runtime_t *runtime = substream->runtime;
-       unsigned int size;
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       unsigned int size, rate;
 
        spin_lock_irqsave(&chip->lock, flags);
 
@@ -274,7 +276,10 @@ static int snd_ad1816a_capture_prepare(snd_pcm_substream_t *substream)
        snd_dma_program(chip->dma2, runtime->dma_addr, size,
                        DMA_MODE_READ | DMA_AUTOINIT);
 
-       snd_ad1816a_write(chip, AD1816A_CAPTURE_SAMPLE_RATE, runtime->rate);
+       rate = runtime->rate;
+       if (chip->clock_freq)
+               rate = (rate * 33000) / chip->clock_freq;
+       snd_ad1816a_write(chip, AD1816A_CAPTURE_SAMPLE_RATE, rate);
        snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG,
                AD1816A_FMT_ALL | AD1816A_FMT_STEREO,
                snd_ad1816a_get_format(chip, runtime->format,
@@ -288,9 +293,9 @@ static int snd_ad1816a_capture_prepare(snd_pcm_substream_t *substream)
 }
 
 
-static snd_pcm_uframes_t snd_ad1816a_playback_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_ad1816a_playback_pointer(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        size_t ptr;
        if (!(chip->mode & AD1816A_MODE_PLAYBACK))
                return 0;
@@ -298,9 +303,9 @@ static snd_pcm_uframes_t snd_ad1816a_playback_pointer(snd_pcm_substream_t *subst
        return bytes_to_frames(substream->runtime, ptr);
 }
 
-static snd_pcm_uframes_t snd_ad1816a_capture_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_ad1816a_capture_pointer(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
        size_t ptr;
        if (!(chip->mode & AD1816A_MODE_CAPTURE))
                return 0;
@@ -311,7 +316,7 @@ static snd_pcm_uframes_t snd_ad1816a_capture_pointer(snd_pcm_substream_t *substr
 
 static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-       ad1816a_t *chip = dev_id;
+       struct snd_ad1816a *chip = dev_id;
        unsigned char status;
 
        spin_lock(&chip->lock);
@@ -334,7 +339,7 @@ static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id, struct pt_regs *
 }
 
 
-static snd_pcm_hardware_t snd_ad1816a_playback = {
+static struct snd_pcm_hardware snd_ad1816a_playback = {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_MMAP_VALID),
        .formats =              (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
@@ -353,7 +358,7 @@ static snd_pcm_hardware_t snd_ad1816a_playback = {
        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_ad1816a_capture = {
+static struct snd_pcm_hardware snd_ad1816a_capture = {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_MMAP_VALID),
        .formats =              (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
@@ -373,32 +378,32 @@ static snd_pcm_hardware_t snd_ad1816a_capture = {
 };
 
 #if 0 /* not used now */
-static int snd_ad1816a_timer_close(snd_timer_t *timer)
+static int snd_ad1816a_timer_close(struct snd_timer *timer)
 {
-       ad1816a_t *chip = snd_timer_chip(timer);
+       struct snd_ad1816a *chip = snd_timer_chip(timer);
        snd_ad1816a_close(chip, AD1816A_MODE_TIMER);
        return 0;
 }
 
-static int snd_ad1816a_timer_open(snd_timer_t *timer)
+static int snd_ad1816a_timer_open(struct snd_timer *timer)
 {
-       ad1816a_t *chip = snd_timer_chip(timer);
+       struct snd_ad1816a *chip = snd_timer_chip(timer);
        snd_ad1816a_open(chip, AD1816A_MODE_TIMER);
        return 0;
 }
 
-static unsigned long snd_ad1816a_timer_resolution(snd_timer_t *timer)
+static unsigned long snd_ad1816a_timer_resolution(struct snd_timer *timer)
 {
        snd_assert(timer != NULL, return 0);
 
        return 10000;
 }
 
-static int snd_ad1816a_timer_start(snd_timer_t *timer)
+static int snd_ad1816a_timer_start(struct snd_timer *timer)
 {
        unsigned short bits;
        unsigned long flags;
-       ad1816a_t *chip = snd_timer_chip(timer);
+       struct snd_ad1816a *chip = snd_timer_chip(timer);
        spin_lock_irqsave(&chip->lock, flags);
        bits = snd_ad1816a_read(chip, AD1816A_INTERRUPT_ENABLE);
 
@@ -413,10 +418,10 @@ static int snd_ad1816a_timer_start(snd_timer_t *timer)
        return 0;
 }
 
-static int snd_ad1816a_timer_stop(snd_timer_t *timer)
+static int snd_ad1816a_timer_stop(struct snd_timer *timer)
 {
        unsigned long flags;
-       ad1816a_t *chip = snd_timer_chip(timer);
+       struct snd_ad1816a *chip = snd_timer_chip(timer);
        spin_lock_irqsave(&chip->lock, flags);
 
        snd_ad1816a_write_mask(chip, AD1816A_INTERRUPT_ENABLE,
@@ -426,7 +431,7 @@ static int snd_ad1816a_timer_stop(snd_timer_t *timer)
        return 0;
 }
 
-static struct _snd_timer_hardware snd_ad1816a_timer_table = {
+static struct snd_timer_hardware snd_ad1816a_timer_table = {
        .flags =        SNDRV_TIMER_HW_AUTO,
        .resolution =   10000,
        .ticks =        65535,
@@ -439,10 +444,10 @@ static struct _snd_timer_hardware snd_ad1816a_timer_table = {
 #endif /* not used now */
 
 
-static int snd_ad1816a_playback_open(snd_pcm_substream_t *substream)
+static int snd_ad1816a_playback_open(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int error;
 
        if ((error = snd_ad1816a_open(chip, AD1816A_MODE_PLAYBACK)) < 0)
@@ -455,10 +460,10 @@ static int snd_ad1816a_playback_open(snd_pcm_substream_t *substream)
        return 0;
 }
 
-static int snd_ad1816a_capture_open(snd_pcm_substream_t *substream)
+static int snd_ad1816a_capture_open(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
        int error;
 
        if ((error = snd_ad1816a_open(chip, AD1816A_MODE_CAPTURE)) < 0)
@@ -471,18 +476,18 @@ static int snd_ad1816a_capture_open(snd_pcm_substream_t *substream)
        return 0;
 }
 
-static int snd_ad1816a_playback_close(snd_pcm_substream_t *substream)
+static int snd_ad1816a_playback_close(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
 
        chip->playback_substream = NULL;
        snd_ad1816a_close(chip, AD1816A_MODE_PLAYBACK);
        return 0;
 }
 
-static int snd_ad1816a_capture_close(snd_pcm_substream_t *substream)
+static int snd_ad1816a_capture_close(struct snd_pcm_substream *substream)
 {
-       ad1816a_t *chip = snd_pcm_substream_chip(substream);
+       struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
 
        chip->capture_substream = NULL;
        snd_ad1816a_close(chip, AD1816A_MODE_CAPTURE);
@@ -490,7 +495,7 @@ static int snd_ad1816a_capture_close(snd_pcm_substream_t *substream)
 }
 
 
-static void snd_ad1816a_init(ad1816a_t *chip)
+static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip)
 {
        unsigned long flags;
 
@@ -510,7 +515,7 @@ static void snd_ad1816a_init(ad1816a_t *chip)
        spin_unlock_irqrestore(&chip->lock, flags);
 }
 
-static int snd_ad1816a_probe(ad1816a_t *chip)
+static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip)
 {
        unsigned long flags;
 
@@ -534,12 +539,9 @@ static int snd_ad1816a_probe(ad1816a_t *chip)
        return 0;
 }
 
-static int snd_ad1816a_free(ad1816a_t *chip)
+static int snd_ad1816a_free(struct snd_ad1816a *chip)
 {
-       if (chip->res_port) {
-               release_resource(chip->res_port);
-               kfree_nocheck(chip->res_port);
-       }
+       release_and_free_resource(chip->res_port);
        if (chip->irq >= 0)
                free_irq(chip->irq, (void *) chip);
        if (chip->dma1 >= 0) {
@@ -554,13 +556,13 @@ static int snd_ad1816a_free(ad1816a_t *chip)
        return 0;
 }
 
-static int snd_ad1816a_dev_free(snd_device_t *device)
+static int snd_ad1816a_dev_free(struct snd_device *device)
 {
-       ad1816a_t *chip = device->device_data;
+       struct snd_ad1816a *chip = device->device_data;
        return snd_ad1816a_free(chip);
 }
 
-static const char *snd_ad1816a_chip_id(ad1816a_t *chip)
+static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
 {
        switch (chip->hardware) {
        case AD1816A_HW_AD1816A: return "AD1816A";
@@ -573,19 +575,19 @@ static const char *snd_ad1816a_chip_id(ad1816a_t *chip)
        }
 }
 
-int snd_ad1816a_create(snd_card_t *card,
-                      unsigned long port, int irq, int dma1, int dma2,
-                      ad1816a_t **rchip)
+int __devinit snd_ad1816a_create(struct snd_card *card,
+                                unsigned long port, int irq, int dma1, int dma2,
+                                struct snd_ad1816a **rchip)
 {
-        static snd_device_ops_t ops = {
+        static struct snd_device_ops ops = {
                .dev_free =     snd_ad1816a_dev_free,
        };
        int error;
-       ad1816a_t *chip;
+       struct snd_ad1816a *chip;
 
        *rchip = NULL;
 
-       chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+       chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (chip == NULL)
                return -ENOMEM;
        chip->irq = -1;
@@ -637,7 +639,7 @@ int snd_ad1816a_create(snd_card_t *card,
        return 0;
 }
 
-static snd_pcm_ops_t snd_ad1816a_playback_ops = {
+static struct snd_pcm_ops snd_ad1816a_playback_ops = {
        .open =         snd_ad1816a_playback_open,
        .close =        snd_ad1816a_playback_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -648,7 +650,7 @@ static snd_pcm_ops_t snd_ad1816a_playback_ops = {
        .pointer =      snd_ad1816a_playback_pointer,
 };
 
-static snd_pcm_ops_t snd_ad1816a_capture_ops = {
+static struct snd_pcm_ops snd_ad1816a_capture_ops = {
        .open =         snd_ad1816a_capture_open,
        .close =        snd_ad1816a_capture_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -659,17 +661,10 @@ static snd_pcm_ops_t snd_ad1816a_capture_ops = {
        .pointer =      snd_ad1816a_capture_pointer,
 };
 
-static void snd_ad1816a_pcm_free(snd_pcm_t *pcm)
-{
-       ad1816a_t *chip = pcm->private_data;
-       chip->pcm = NULL;
-       snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-int snd_ad1816a_pcm(ad1816a_t *chip, int device, snd_pcm_t **rpcm)
+int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)
 {
        int error;
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
 
        if ((error = snd_pcm_new(chip->card, "AD1816A", device, 1, 1, &pcm)))
                return error;
@@ -678,7 +673,6 @@ int snd_ad1816a_pcm(ad1816a_t *chip, int device, snd_pcm_t **rpcm)
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ad1816a_capture_ops);
 
        pcm->private_data = chip;
-       pcm->private_free = snd_ad1816a_pcm_free;
        pcm->info_flags = (chip->dma1 == chip->dma2 ) ? SNDRV_PCM_INFO_JOINT_DUPLEX : 0;
 
        strcpy(pcm->name, snd_ad1816a_chip_id(chip));
@@ -695,16 +689,10 @@ int snd_ad1816a_pcm(ad1816a_t *chip, int device, snd_pcm_t **rpcm)
 }
 
 #if 0 /* not used now */
-static void snd_ad1816a_timer_free(snd_timer_t *timer)
-{
-       ad1816a_t *chip = timer->private_data;
-       chip->timer = NULL;
-}
-
-int snd_ad1816a_timer(ad1816a_t *chip, int device, snd_timer_t **rtimer)
+int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer)
 {
-       snd_timer_t *timer;
-       snd_timer_id_t tid;
+       struct snd_timer *timer;
+       struct snd_timer_id tid;
        int error;
 
        tid.dev_class = SNDRV_TIMER_CLASS_CARD;
@@ -716,7 +704,6 @@ int snd_ad1816a_timer(ad1816a_t *chip, int device, snd_timer_t **rtimer)
                return error;
        strcpy(timer->name, snd_ad1816a_chip_id(chip));
        timer->private_data = chip;
-       timer->private_free = snd_ad1816a_timer_free;
        chip->timer = timer;
        timer->hw = snd_ad1816a_timer_table;
        if (rtimer)
@@ -729,7 +716,7 @@ int snd_ad1816a_timer(ad1816a_t *chip, int device, snd_timer_t **rtimer)
  *
  */
 
-static int snd_ad1816a_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        static char *texts[8] = {
                "Line", "Mix", "CD", "Synth", "Video",
@@ -745,9 +732,9 @@ static int snd_ad1816a_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
        return 0;
 }
 
-static int snd_ad1816a_get_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        unsigned short val;
        
@@ -759,9 +746,9 @@ static int snd_ad1816a_get_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
        return 0;
 }
 
-static int snd_ad1816a_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        unsigned short val;
        int change;
@@ -783,7 +770,7 @@ static int snd_ad1816a_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
   .get = snd_ad1816a_get_single, .put = snd_ad1816a_put_single, \
   .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
-static int snd_ad1816a_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ad1816a_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        int mask = (kcontrol->private_value >> 16) & 0xff;
 
@@ -794,9 +781,9 @@ static int snd_ad1816a_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
        return 0;
 }
 
-static int snd_ad1816a_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 8) & 0xff;
@@ -811,9 +798,9 @@ static int snd_ad1816a_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
        return 0;
 }
 
-static int snd_ad1816a_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift = (kcontrol->private_value >> 8) & 0xff;
@@ -840,7 +827,7 @@ static int snd_ad1816a_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
   .get = snd_ad1816a_get_double, .put = snd_ad1816a_put_double, \
   .private_value = reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
 
-static int snd_ad1816a_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ad1816a_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        int mask = (kcontrol->private_value >> 16) & 0xff;
 
@@ -851,9 +838,9 @@ static int snd_ad1816a_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
        return 0;
 }
 
-static int snd_ad1816a_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift_left = (kcontrol->private_value >> 8) & 0x0f;
@@ -874,9 +861,9 @@ static int snd_ad1816a_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
        return 0;
 }
 
-static int snd_ad1816a_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ad1816a_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       ad1816a_t *chip = snd_kcontrol_chip(kcontrol);
+       struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);
        unsigned long flags;
        int reg = kcontrol->private_value & 0xff;
        int shift_left = (kcontrol->private_value >> 8) & 0x0f;
@@ -903,7 +890,7 @@ static int snd_ad1816a_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
        return change;
 }
 
-static snd_kcontrol_new_t snd_ad1816a_controls[] = {
+static struct snd_kcontrol_new snd_ad1816a_controls[] __devinitdata = {
 AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
 AD1816A_DOUBLE("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1),
 AD1816A_DOUBLE("PCM Playback Switch", AD1816A_VOICE_ATT, 15, 7, 1, 1),
@@ -938,9 +925,9 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1),
 AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0),
 };
                                         
-int snd_ad1816a_mixer(ad1816a_t *chip)
+int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)
 {
-       snd_card_t *card;
+       struct snd_card *card;
        unsigned int idx;
        int err;
 
@@ -956,19 +943,3 @@ int snd_ad1816a_mixer(ad1816a_t *chip)
        }
        return 0;
 }
-
-EXPORT_SYMBOL(snd_ad1816a_create);
-EXPORT_SYMBOL(snd_ad1816a_pcm);
-EXPORT_SYMBOL(snd_ad1816a_mixer);
-
-static int __init alsa_ad1816a_init(void)
-{
-       return 0;
-}
-
-static void __exit alsa_ad1816a_exit(void)
-{
-}
-
-module_init(alsa_ad1816a_init)
-module_exit(alsa_ad1816a_exit)