[ALSA] Remove xxx_t typedefs: PCI Intel8x0
[linux-2.6.git] / sound / pci / ens1370.c
index 2daa575..2cc0f83 100644 (file)
  *
  */
 
+/* Power-Management-Code ( CONFIG_PM )
+ * for ens1371 only ( FIXME )
+ * derived from cs4281.c, atiixp.c and via82xx.c
+ * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm
+ * by Kurt J. Bosch
+ */
+
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -360,9 +367,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");
 
  */
 
-typedef struct _snd_ensoniq ensoniq_t;
-
-struct _snd_ensoniq {
+struct ensoniq {
        spinlock_t reg_lock;
        struct semaphore src_mutex;
 
@@ -385,12 +390,12 @@ struct _snd_ensoniq {
        union {
 #ifdef CHIP1371
                struct {
-                       ac97_t *ac97;
+                       struct snd_ac97 *ac97;
                } es1371;
 #else
                struct {
                        int pclkdiv_lock;
-                       ak4531_t *ak4531;
+                       struct snd_ak4531 *ak4531;
                } es1370;
 #endif
        } u;
@@ -398,21 +403,21 @@ struct _snd_ensoniq {
        struct pci_dev *pci;
        unsigned short subsystem_vendor_id;
        unsigned short subsystem_device_id;
-       snd_card_t *card;
-       snd_pcm_t *pcm1;        /* DAC1/ADC PCM */
-       snd_pcm_t *pcm2;        /* DAC2 PCM */
-       snd_pcm_substream_t *playback1_substream;
-       snd_pcm_substream_t *playback2_substream;
-       snd_pcm_substream_t *capture_substream;
+       struct snd_card *card;
+       struct snd_pcm *pcm1;   /* DAC1/ADC PCM */
+       struct snd_pcm *pcm2;   /* DAC2 PCM */
+       struct snd_pcm_substream *playback1_substream;
+       struct snd_pcm_substream *playback2_substream;
+       struct snd_pcm_substream *capture_substream;
        unsigned int p1_dma_size;
        unsigned int p2_dma_size;
        unsigned int c_dma_size;
        unsigned int p1_period_size;
        unsigned int p2_period_size;
        unsigned int c_period_size;
-       snd_rawmidi_t *rmidi;
-       snd_rawmidi_substream_t *midi_input;
-       snd_rawmidi_substream_t *midi_output;
+       struct snd_rawmidi *rmidi;
+       struct snd_rawmidi_substream *midi_input;
+       struct snd_rawmidi_substream *midi_output;
 
        unsigned int spdif;
        unsigned int spdif_default;
@@ -452,39 +457,39 @@ MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
 #ifdef CHIP1370
 static unsigned int snd_es1370_fixed_rates[] =
        {5512, 11025, 22050, 44100};
-static snd_pcm_hw_constraint_list_t snd_es1370_hw_constraints_rates = {
+static struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = {
        .count = 4, 
        .list = snd_es1370_fixed_rates,
        .mask = 0,
 };
-static ratnum_t es1370_clock = {
+static struct snd_ratnum es1370_clock = {
        .num = ES_1370_SRCLOCK,
        .den_min = 29, 
        .den_max = 353,
        .den_step = 1,
 };
-static snd_pcm_hw_constraint_ratnums_t snd_es1370_hw_constraints_clock = {
+static struct snd_pcm_hw_constraint_ratnums snd_es1370_hw_constraints_clock = {
        .nrats = 1,
        .rats = &es1370_clock,
 };
 #else
-static ratden_t es1371_dac_clock = {
+static struct snd_ratden es1371_dac_clock = {
        .num_min = 3000 * (1 << 15),
        .num_max = 48000 * (1 << 15),
        .num_step = 3000,
        .den = 1 << 15,
 };
-static snd_pcm_hw_constraint_ratdens_t snd_es1371_hw_constraints_dac_clock = {
+static struct snd_pcm_hw_constraint_ratdens snd_es1371_hw_constraints_dac_clock = {
        .nrats = 1,
        .rats = &es1371_dac_clock,
 };
-static ratnum_t es1371_adc_clock = {
+static struct snd_ratnum es1371_adc_clock = {
        .num = 48000 << 15,
        .den_min = 32768, 
        .den_max = 393216,
        .den_step = 1,
 };
-static snd_pcm_hw_constraint_ratnums_t snd_es1371_hw_constraints_adc_clock = {
+static struct snd_pcm_hw_constraint_ratnums snd_es1371_hw_constraints_adc_clock = {
        .nrats = 1,
        .rats = &es1371_adc_clock,
 };
@@ -498,7 +503,7 @@ static const unsigned int snd_ensoniq_sample_shift[] =
 
 #ifdef CHIP1371
 
-static unsigned int snd_es1371_wait_src_ready(ensoniq_t * ensoniq)
+static unsigned int snd_es1371_wait_src_ready(struct ensoniq * ensoniq)
 {
        unsigned int t, r = 0;
 
@@ -508,11 +513,12 @@ static unsigned int snd_es1371_wait_src_ready(ensoniq_t * ensoniq)
                        return r;
                cond_resched();
        }
-       snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r);
+       snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n",
+                  ES_REG(ensoniq, 1371_SMPRATE), r);
        return 0;
 }
 
-static unsigned int snd_es1371_src_read(ensoniq_t * ensoniq, unsigned short reg)
+static unsigned int snd_es1371_src_read(struct ensoniq * ensoniq, unsigned short reg)
 {
        unsigned int temp, i, orig, r;
 
@@ -546,7 +552,7 @@ static unsigned int snd_es1371_src_read(ensoniq_t * ensoniq, unsigned short reg)
        return temp;
 }
 
-static void snd_es1371_src_write(ensoniq_t * ensoniq,
+static void snd_es1371_src_write(struct ensoniq * ensoniq,
                                 unsigned short reg, unsigned short data)
 {
        unsigned int r;
@@ -562,14 +568,15 @@ static void snd_es1371_src_write(ensoniq_t * ensoniq,
 
 #ifdef CHIP1370
 
-static void snd_es1370_codec_write(ak4531_t *ak4531,
+static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
                                   unsigned short reg, unsigned short val)
 {
-       ensoniq_t *ensoniq = ak4531->private_data;
+       struct ensoniq *ensoniq = ak4531->private_data;
        unsigned long end_time = jiffies + HZ / 10;
 
 #if 0
-       printk("CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n", reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
+       printk("CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
+              reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
 #endif
        do {
                if (!(inl(ES_REG(ensoniq, STATUS)) & ES_1370_CSTAT)) {
@@ -578,17 +585,18 @@ static void snd_es1370_codec_write(ak4531_t *ak4531,
                }
                schedule_timeout_uninterruptible(1);
        } while (time_after(end_time, jiffies));
-       snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS)));
+       snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n",
+                  inl(ES_REG(ensoniq, STATUS)));
 }
 
 #endif /* CHIP1370 */
 
 #ifdef CHIP1371
 
-static void snd_es1371_codec_write(ac97_t *ac97,
+static void snd_es1371_codec_write(struct snd_ac97 *ac97,
                                   unsigned short reg, unsigned short val)
 {
-       ensoniq_t *ensoniq = ac97->private_data;
+       struct ensoniq *ensoniq = ac97->private_data;
        unsigned int t, x;
 
        down(&ensoniq->src_mutex);
@@ -602,12 +610,14 @@ static void snd_es1371_codec_write(ac97_t *ac97,
                        /* wait for not busy (state 0) first to avoid
                           transition states */
                        for (t = 0; t < POLL_COUNT; t++) {
-                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) == 0x00000000)
+                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) ==
+                                   0x00000000)
                                        break;
                        }
                        /* wait for a SAFE time to write addr/data and then do it, dammit */
                        for (t = 0; t < POLL_COUNT; t++) {
-                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) == 0x00010000)
+                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) ==
+                                   0x00010000)
                                        break;
                        }
                        outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));
@@ -619,13 +629,14 @@ static void snd_es1371_codec_write(ac97_t *ac97,
                }
        }
        up(&ensoniq->src_mutex);
-       snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
+       snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n",
+                  ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
 }
 
-static unsigned short snd_es1371_codec_read(ac97_t *ac97,
+static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
                                            unsigned short reg)
 {
-       ensoniq_t *ensoniq = ac97->private_data;
+       struct ensoniq *ensoniq = ac97->private_data;
        unsigned int t, x, fail = 0;
 
       __again:
@@ -640,12 +651,14 @@ static unsigned short snd_es1371_codec_read(ac97_t *ac97,
                        /* wait for not busy (state 0) first to avoid
                           transition states */
                        for (t = 0; t < POLL_COUNT; t++) {
-                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) == 0x00000000)
+                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) ==
+                                   0x00000000)
                                        break;
                        }
                        /* wait for a SAFE time to write addr/data and then do it, dammit */
                        for (t = 0; t < POLL_COUNT; t++) {
-                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) == 0x00010000)
+                               if ((inl(ES_REG(ensoniq, 1371_SMPRATE)) & 0x00870000) ==
+                                   0x00010000)
                                        break;
                        }
                        outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));
@@ -666,18 +679,22 @@ static unsigned short snd_es1371_codec_read(ac97_t *ac97,
                        }
                        up(&ensoniq->src_mutex);
                        if (++fail > 10) {
-                               snd_printk(KERN_ERR "codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC)));
+                               snd_printk(KERN_ERR "codec read timeout (final) "
+                                          "at 0x%lx, reg = 0x%x [0x%x]\n",
+                                          ES_REG(ensoniq, 1371_CODEC), reg,
+                                          inl(ES_REG(ensoniq, 1371_CODEC)));
                                return 0;
                        }
                        goto __again;
                }
        }
        up(&ensoniq->src_mutex);
-       snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
+       snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n",
+                  ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));
        return 0;
 }
 
-static void snd_es1371_codec_wait(ac97_t *ac97)
+static void snd_es1371_codec_wait(struct snd_ac97 *ac97)
 {
        msleep(750);
        snd_es1371_codec_read(ac97, AC97_RESET);
@@ -686,7 +703,7 @@ static void snd_es1371_codec_wait(ac97_t *ac97)
        msleep(50);
 }
 
-static void snd_es1371_adc_rate(ensoniq_t * ensoniq, unsigned int rate)
+static void snd_es1371_adc_rate(struct ensoniq * ensoniq, unsigned int rate)
 {
        unsigned int n, truncm, freq, result;
 
@@ -709,60 +726,70 @@ static void snd_es1371_adc_rate(ensoniq_t * ensoniq, unsigned int rate)
                                0x8000 | (((119 - truncm) >> 1) << 9) | (n << 4));
        }
        snd_es1371_src_write(ensoniq, ES_SMPREG_ADC + ES_SMPREG_INT_REGS,
-                            (snd_es1371_src_read(ensoniq, ES_SMPREG_ADC + ES_SMPREG_INT_REGS) & 0x00ff) |
-                                    ((freq >> 5) & 0xfc00));
+                            (snd_es1371_src_read(ensoniq, ES_SMPREG_ADC +
+                                                 ES_SMPREG_INT_REGS) & 0x00ff) |
+                            ((freq >> 5) & 0xfc00));
        snd_es1371_src_write(ensoniq, ES_SMPREG_ADC + ES_SMPREG_VFREQ_FRAC, freq & 0x7fff);
        snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC, n << 8);
        snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC + 1, n << 8);
        up(&ensoniq->src_mutex);
 }
 
-static void snd_es1371_dac1_rate(ensoniq_t * ensoniq, unsigned int rate)
+static void snd_es1371_dac1_rate(struct ensoniq * ensoniq, unsigned int rate)
 {
        unsigned int freq, r;
 
        down(&ensoniq->src_mutex);
        freq = ((rate << 15) + 1500) / 3000;
-       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE | ES_1371_DIS_P2 | ES_1371_DIS_R1)) | ES_1371_DIS_P1;
+       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
+                                                  ES_1371_DIS_P2 | ES_1371_DIS_R1)) |
+               ES_1371_DIS_P1;
        outl(r, ES_REG(ensoniq, 1371_SMPRATE));
        snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_INT_REGS,
-                            (snd_es1371_src_read(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_INT_REGS) & 0x00ff) |
+                            (snd_es1371_src_read(ensoniq, ES_SMPREG_DAC1 +
+                                                 ES_SMPREG_INT_REGS) & 0x00ff) |
                             ((freq >> 5) & 0xfc00));
        snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_VFREQ_FRAC, freq & 0x7fff);
-       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE | ES_1371_DIS_P2 | ES_1371_DIS_R1));
+       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
+                                                  ES_1371_DIS_P2 | ES_1371_DIS_R1));
        outl(r, ES_REG(ensoniq, 1371_SMPRATE));
        up(&ensoniq->src_mutex);
 }
 
-static void snd_es1371_dac2_rate(ensoniq_t * ensoniq, unsigned int rate)
+static void snd_es1371_dac2_rate(struct ensoniq * ensoniq, unsigned int rate)
 {
        unsigned int freq, r;
 
        down(&ensoniq->src_mutex);
        freq = ((rate << 15) + 1500) / 3000;
-       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE | ES_1371_DIS_P1 | ES_1371_DIS_R1)) | ES_1371_DIS_P2;
+       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
+                                                  ES_1371_DIS_P1 | ES_1371_DIS_R1)) |
+               ES_1371_DIS_P2;
        outl(r, ES_REG(ensoniq, 1371_SMPRATE));
        snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_INT_REGS,
-                            (snd_es1371_src_read(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_INT_REGS) & 0x00ff) |
+                            (snd_es1371_src_read(ensoniq, ES_SMPREG_DAC2 +
+                                                 ES_SMPREG_INT_REGS) & 0x00ff) |
                             ((freq >> 5) & 0xfc00));
-       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_VFREQ_FRAC, freq & 0x7fff);
-       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE | ES_1371_DIS_P1 | ES_1371_DIS_R1));
+       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_VFREQ_FRAC,
+                            freq & 0x7fff);
+       r = (snd_es1371_wait_src_ready(ensoniq) & (ES_1371_SRC_DISABLE |
+                                                  ES_1371_DIS_P1 | ES_1371_DIS_R1));
        outl(r, ES_REG(ensoniq, 1371_SMPRATE));
        up(&ensoniq->src_mutex);
 }
 
 #endif /* CHIP1371 */
 
-static int snd_ensoniq_trigger(snd_pcm_substream_t *substream, int cmd)
+static int snd_ensoniq_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
        {
                unsigned int what = 0;
                struct list_head *pos;
-               snd_pcm_substream_t *s;
+               struct snd_pcm_substream *s;
                snd_pcm_group_for_each(pos, substream) {
                        s = snd_pcm_group_substream_entry(pos);
                        if (s == ensoniq->playback1_substream) {
@@ -788,7 +815,7 @@ static int snd_ensoniq_trigger(snd_pcm_substream_t *substream, int cmd)
        {
                unsigned int what = 0;
                struct list_head *pos;
-               snd_pcm_substream_t *s;
+               struct snd_pcm_substream *s;
                snd_pcm_group_for_each(pos, substream) {
                        s = snd_pcm_group_substream_entry(pos);
                        if (s == ensoniq->playback1_substream) {
@@ -821,21 +848,21 @@ static int snd_ensoniq_trigger(snd_pcm_substream_t *substream, int cmd)
  *  PCM part
  */
 
-static int snd_ensoniq_hw_params(snd_pcm_substream_t * substream,
-                                snd_pcm_hw_params_t * hw_params)
+static int snd_ensoniq_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_ensoniq_hw_free(snd_pcm_substream_t * substream)
+static int snd_ensoniq_hw_free(struct snd_pcm_substream *substream)
 {
        return snd_pcm_lib_free_pages(substream);
 }
 
-static int snd_ensoniq_playback1_prepare(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback1_prepare(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int mode = 0;
 
        ensoniq->p1_dma_size = snd_pcm_lib_buffer_bytes(substream);
@@ -860,7 +887,8 @@ static int snd_ensoniq_playback1_prepare(snd_pcm_substream_t * substream)
        ensoniq->sctrl &= ~(ES_P1_LOOP_SEL | ES_P1_PAUSE | ES_P1_SCT_RLD | ES_P1_MODEM);
        ensoniq->sctrl |= ES_P1_INT_EN | ES_P1_MODEO(mode);
        outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
-       outl((ensoniq->p1_period_size >> snd_ensoniq_sample_shift[mode]) - 1, ES_REG(ensoniq, DAC1_COUNT));
+       outl((ensoniq->p1_period_size >> snd_ensoniq_sample_shift[mode]) - 1,
+            ES_REG(ensoniq, DAC1_COUNT));
 #ifdef CHIP1370
        ensoniq->ctrl &= ~ES_1370_WTSRSELM;
        switch (runtime->rate) {
@@ -879,10 +907,10 @@ static int snd_ensoniq_playback1_prepare(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_playback2_prepare(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback2_prepare(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int mode = 0;
 
        ensoniq->p2_dma_size = snd_pcm_lib_buffer_bytes(substream);
@@ -902,7 +930,8 @@ static int snd_ensoniq_playback2_prepare(snd_pcm_substream_t * substream)
        ensoniq->sctrl |= ES_P2_INT_EN | ES_P2_MODEO(mode) |
                          ES_P2_END_INCO(mode & 2 ? 2 : 1) | ES_P2_ST_INCO(0);
        outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
-       outl((ensoniq->p2_period_size >> snd_ensoniq_sample_shift[mode]) - 1, ES_REG(ensoniq, DAC2_COUNT));
+       outl((ensoniq->p2_period_size >> snd_ensoniq_sample_shift[mode]) - 1,
+            ES_REG(ensoniq, DAC2_COUNT));
 #ifdef CHIP1370
        if (!(ensoniq->u.es1370.pclkdiv_lock & ES_MODE_CAPTURE)) {
                ensoniq->ctrl &= ~ES_1370_PCLKDIVM;
@@ -918,10 +947,10 @@ static int snd_ensoniq_playback2_prepare(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_capture_prepare(snd_pcm_substream_t * substream)
+static int snd_ensoniq_capture_prepare(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int mode = 0;
 
        ensoniq->c_dma_size = snd_pcm_lib_buffer_bytes(substream);
@@ -939,7 +968,8 @@ static int snd_ensoniq_capture_prepare(snd_pcm_substream_t * substream)
        ensoniq->sctrl &= ~(ES_R1_LOOP_SEL | ES_R1_MODEM);
        ensoniq->sctrl |= ES_R1_INT_EN | ES_R1_MODEO(mode);
        outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
-       outl((ensoniq->c_period_size >> snd_ensoniq_sample_shift[mode]) - 1, ES_REG(ensoniq, ADC_COUNT));
+       outl((ensoniq->c_period_size >> snd_ensoniq_sample_shift[mode]) - 1,
+            ES_REG(ensoniq, ADC_COUNT));
 #ifdef CHIP1370
        if (!(ensoniq->u.es1370.pclkdiv_lock & ES_MODE_PLAY2)) {
                ensoniq->ctrl &= ~ES_1370_PCLKDIVM;
@@ -955,9 +985,9 @@ static int snd_ensoniq_capture_prepare(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static snd_pcm_uframes_t snd_ensoniq_playback1_pointer(snd_pcm_substream_t * substream)
+static snd_pcm_uframes_t snd_ensoniq_playback1_pointer(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
        size_t ptr;
 
        spin_lock(&ensoniq->reg_lock);
@@ -972,9 +1002,9 @@ static snd_pcm_uframes_t snd_ensoniq_playback1_pointer(snd_pcm_substream_t * sub
        return ptr;
 }
 
-static snd_pcm_uframes_t snd_ensoniq_playback2_pointer(snd_pcm_substream_t * substream)
+static snd_pcm_uframes_t snd_ensoniq_playback2_pointer(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
        size_t ptr;
 
        spin_lock(&ensoniq->reg_lock);
@@ -989,9 +1019,9 @@ static snd_pcm_uframes_t snd_ensoniq_playback2_pointer(snd_pcm_substream_t * sub
        return ptr;
 }
 
-static snd_pcm_uframes_t snd_ensoniq_capture_pointer(snd_pcm_substream_t * substream)
+static snd_pcm_uframes_t snd_ensoniq_capture_pointer(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
        size_t ptr;
 
        spin_lock(&ensoniq->reg_lock);
@@ -1006,7 +1036,7 @@ static snd_pcm_uframes_t snd_ensoniq_capture_pointer(snd_pcm_substream_t * subst
        return ptr;
 }
 
-static snd_pcm_hardware_t snd_ensoniq_playback1 =
+static struct snd_pcm_hardware snd_ensoniq_playback1 =
 {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -1033,7 +1063,7 @@ static snd_pcm_hardware_t snd_ensoniq_playback1 =
        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_ensoniq_playback2 =
+static struct snd_pcm_hardware snd_ensoniq_playback2 =
 {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -1053,7 +1083,7 @@ static snd_pcm_hardware_t snd_ensoniq_playback2 =
        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_ensoniq_capture =
+static struct snd_pcm_hardware snd_ensoniq_capture =
 {
        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -1072,10 +1102,10 @@ static snd_pcm_hardware_t snd_ensoniq_capture =
        .fifo_size =            0,
 };
 
-static int snd_ensoniq_playback1_open(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback1_open(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        ensoniq->mode |= ES_MODE_PLAY1;
        ensoniq->playback1_substream = substream;
@@ -1095,10 +1125,10 @@ static int snd_ensoniq_playback1_open(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_playback2_open(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback2_open(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        ensoniq->mode |= ES_MODE_PLAY2;
        ensoniq->playback2_substream = substream;
@@ -1118,10 +1148,10 @@ static int snd_ensoniq_playback2_open(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_capture_open(snd_pcm_substream_t * substream)
+static int snd_ensoniq_capture_open(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        ensoniq->mode |= ES_MODE_CAPTURE;
        ensoniq->capture_substream = substream;
@@ -1137,18 +1167,18 @@ static int snd_ensoniq_capture_open(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_playback1_close(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback1_close(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
 
        ensoniq->playback1_substream = NULL;
        ensoniq->mode &= ~ES_MODE_PLAY1;
        return 0;
 }
 
-static int snd_ensoniq_playback2_close(snd_pcm_substream_t * substream)
+static int snd_ensoniq_playback2_close(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
 
        ensoniq->playback2_substream = NULL;
        spin_lock_irq(&ensoniq->reg_lock);
@@ -1160,9 +1190,9 @@ static int snd_ensoniq_playback2_close(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_capture_close(snd_pcm_substream_t * substream)
+static int snd_ensoniq_capture_close(struct snd_pcm_substream *substream)
 {
-       ensoniq_t *ensoniq = snd_pcm_substream_chip(substream);
+       struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);
 
        ensoniq->capture_substream = NULL;
        spin_lock_irq(&ensoniq->reg_lock);
@@ -1174,7 +1204,7 @@ static int snd_ensoniq_capture_close(snd_pcm_substream_t * substream)
        return 0;
 }
 
-static snd_pcm_ops_t snd_ensoniq_playback1_ops = {
+static struct snd_pcm_ops snd_ensoniq_playback1_ops = {
        .open =         snd_ensoniq_playback1_open,
        .close =        snd_ensoniq_playback1_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1185,7 +1215,7 @@ static snd_pcm_ops_t snd_ensoniq_playback1_ops = {
        .pointer =      snd_ensoniq_playback1_pointer,
 };
 
-static snd_pcm_ops_t snd_ensoniq_playback2_ops = {
+static struct snd_pcm_ops snd_ensoniq_playback2_ops = {
        .open =         snd_ensoniq_playback2_open,
        .close =        snd_ensoniq_playback2_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1196,7 +1226,7 @@ static snd_pcm_ops_t snd_ensoniq_playback2_ops = {
        .pointer =      snd_ensoniq_playback2_pointer,
 };
 
-static snd_pcm_ops_t snd_ensoniq_capture_ops = {
+static struct snd_pcm_ops snd_ensoniq_capture_ops = {
        .open =         snd_ensoniq_capture_open,
        .close =        snd_ensoniq_capture_close,
        .ioctl =        snd_pcm_lib_ioctl,
@@ -1207,16 +1237,10 @@ static snd_pcm_ops_t snd_ensoniq_capture_ops = {
        .pointer =      snd_ensoniq_capture_pointer,
 };
 
-static void snd_ensoniq_pcm_free(snd_pcm_t *pcm)
+static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,
+                                    struct snd_pcm ** rpcm)
 {
-       ensoniq_t *ensoniq = pcm->private_data;
-       ensoniq->pcm1 = NULL;
-       snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm)
-{
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
        int err;
 
        if (rpcm)
@@ -1237,7 +1261,6 @@ static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ensoniq_capture_ops);
 
        pcm->private_data = ensoniq;
-       pcm->private_free = snd_ensoniq_pcm_free;
        pcm->info_flags = 0;
 #ifdef CHIP1370
        strcpy(pcm->name, "ES1370 DAC2/ADC");
@@ -1254,16 +1277,10 @@ static int __devinit snd_ensoniq_pcm(ensoniq_t * ensoniq, int device, snd_pcm_t
        return 0;
 }
 
-static void snd_ensoniq_pcm_free2(snd_pcm_t *pcm)
-{
-       ensoniq_t *ensoniq = pcm->private_data;
-       ensoniq->pcm2 = NULL;
-       snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t ** rpcm)
+static int __devinit snd_ensoniq_pcm2(struct ensoniq * ensoniq, int device,
+                                     struct snd_pcm ** rpcm)
 {
-       snd_pcm_t *pcm;
+       struct snd_pcm *pcm;
        int err;
 
        if (rpcm)
@@ -1282,7 +1299,6 @@ static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ensoniq_playback2_ops);
 #endif
        pcm->private_data = ensoniq;
-       pcm->private_free = snd_ensoniq_pcm_free2;
        pcm->info_flags = 0;
 #ifdef CHIP1370
        strcpy(pcm->name, "ES1370 DAC1");
@@ -1307,17 +1323,18 @@ static int __devinit snd_ensoniq_pcm2(ensoniq_t * ensoniq, int device, snd_pcm_t
  * ENS1371 mixer (including SPDIF interface)
  */
 #ifdef CHIP1371
-static int snd_ens1373_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ens1373_spdif_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
        uinfo->count = 1;
        return 0;
 }
 
-static int snd_ens1373_spdif_default_get(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
+static int snd_ens1373_spdif_default_get(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        spin_lock_irq(&ensoniq->reg_lock);
        ucontrol->value.iec958.status[0] = (ensoniq->spdif_default >> 0) & 0xff;
        ucontrol->value.iec958.status[1] = (ensoniq->spdif_default >> 8) & 0xff;
@@ -1327,10 +1344,10 @@ static int snd_ens1373_spdif_default_get(snd_kcontrol_t * kcontrol,
        return 0;
 }
 
-static int snd_ens1373_spdif_default_put(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
+static int snd_ens1373_spdif_default_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        unsigned int val;
        int change;
 
@@ -1341,14 +1358,15 @@ static int snd_ens1373_spdif_default_put(snd_kcontrol_t * kcontrol,
        spin_lock_irq(&ensoniq->reg_lock);
        change = ensoniq->spdif_default != val;
        ensoniq->spdif_default = val;
-       if (change && ensoniq->playback1_substream == NULL && ensoniq->playback2_substream == NULL)
+       if (change && ensoniq->playback1_substream == NULL &&
+           ensoniq->playback2_substream == NULL)
                outl(val, ES_REG(ensoniq, CHANNEL_STATUS));
        spin_unlock_irq(&ensoniq->reg_lock);
        return change;
 }
 
-static int snd_ens1373_spdif_mask_get(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
+static int snd_ens1373_spdif_mask_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
 {
        ucontrol->value.iec958.status[0] = 0xff;
        ucontrol->value.iec958.status[1] = 0xff;
@@ -1357,10 +1375,10 @@ static int snd_ens1373_spdif_mask_get(snd_kcontrol_t * kcontrol,
        return 0;
 }
 
-static int snd_ens1373_spdif_stream_get(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
+static int snd_ens1373_spdif_stream_get(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        spin_lock_irq(&ensoniq->reg_lock);
        ucontrol->value.iec958.status[0] = (ensoniq->spdif_stream >> 0) & 0xff;
        ucontrol->value.iec958.status[1] = (ensoniq->spdif_stream >> 8) & 0xff;
@@ -1370,10 +1388,10 @@ static int snd_ens1373_spdif_stream_get(snd_kcontrol_t * kcontrol,
        return 0;
 }
 
-static int snd_ens1373_spdif_stream_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
+static int snd_ens1373_spdif_stream_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        unsigned int val;
        int change;
 
@@ -1384,7 +1402,8 @@ static int snd_ens1373_spdif_stream_put(snd_kcontrol_t * kcontrol,
        spin_lock_irq(&ensoniq->reg_lock);
        change = ensoniq->spdif_stream != val;
        ensoniq->spdif_stream = val;
-       if (change && (ensoniq->playback1_substream != NULL || ensoniq->playback2_substream != NULL))
+       if (change && (ensoniq->playback1_substream != NULL ||
+                      ensoniq->playback2_substream != NULL))
                outl(val, ES_REG(ensoniq, CHANNEL_STATUS));
        spin_unlock_irq(&ensoniq->reg_lock);
        return change;
@@ -1394,7 +1413,8 @@ static int snd_ens1373_spdif_stream_put(snd_kcontrol_t * kcontrol,
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_es1371_spdif_info, \
   .get = snd_es1371_spdif_get, .put = snd_es1371_spdif_put }
 
-static int snd_es1371_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_es1371_spdif_info(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
         uinfo->count = 1;
@@ -1403,9 +1423,10 @@ static int snd_es1371_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
         return 0;
 }
 
-static int snd_es1371_spdif_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1371_spdif_get(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        
        spin_lock_irq(&ensoniq->reg_lock);
        ucontrol->value.integer.value[0] = ensoniq->ctrl & ES_1373_SPDIF_THRU ? 1 : 0;
@@ -1413,9 +1434,10 @@ static int snd_es1371_spdif_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
        return 0;
 }
 
-static int snd_es1371_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1371_spdif_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        unsigned int nval1, nval2;
        int change;
        
@@ -1435,7 +1457,7 @@ static int snd_es1371_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 
 
 /* spdif controls */
-static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = {
+static struct snd_kcontrol_new snd_es1371_mixer_spdif[] __devinitdata = {
        ES1371_SPDIF(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH)),
        {
                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
@@ -1461,7 +1483,8 @@ static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = {
 };
 
 
-static int snd_es1373_rear_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_es1373_rear_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
         uinfo->count = 1;
@@ -1470,28 +1493,33 @@ static int snd_es1373_rear_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *u
         return 0;
 }
 
-static int snd_es1373_rear_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1373_rear_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        int val = 0;
        
        spin_lock_irq(&ensoniq->reg_lock);
-       if ((ensoniq->cssr & (ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|ES_1373_REAR_BIT24)) == ES_1373_REAR_BIT26)
+       if ((ensoniq->cssr & (ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|
+                             ES_1373_REAR_BIT24)) == ES_1373_REAR_BIT26)
                val = 1;
        ucontrol->value.integer.value[0] = val;
        spin_unlock_irq(&ensoniq->reg_lock);
        return 0;
 }
 
-static int snd_es1373_rear_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1373_rear_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        unsigned int nval1;
        int change;
        
-       nval1 = ucontrol->value.integer.value[0] ? ES_1373_REAR_BIT26 : (ES_1373_REAR_BIT27|ES_1373_REAR_BIT24);
+       nval1 = ucontrol->value.integer.value[0] ?
+               ES_1373_REAR_BIT26 : (ES_1373_REAR_BIT27|ES_1373_REAR_BIT24);
        spin_lock_irq(&ensoniq->reg_lock);
-       change = (ensoniq->cssr & (ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|ES_1373_REAR_BIT24)) != nval1;
+       change = (ensoniq->cssr & (ES_1373_REAR_BIT27|
+                                  ES_1373_REAR_BIT26|ES_1373_REAR_BIT24)) != nval1;
        ensoniq->cssr &= ~(ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|ES_1373_REAR_BIT24);
        ensoniq->cssr |= nval1;
        outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
@@ -1499,7 +1527,7 @@ static int snd_es1373_rear_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
        return change;
 }
 
-static snd_kcontrol_new_t snd_ens1373_rear __devinitdata =
+static struct snd_kcontrol_new snd_ens1373_rear __devinitdata =
 {
        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
        .name =         "AC97 2ch->4ch Copy Switch",
@@ -1508,7 +1536,8 @@ static snd_kcontrol_new_t snd_ens1373_rear __devinitdata =
        .put =          snd_es1373_rear_put,
 };
 
-static int snd_es1373_line_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_es1373_line_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
        uinfo->count = 1;
@@ -1517,9 +1546,10 @@ static int snd_es1373_line_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *u
        return 0;
 }
 
-static int snd_es1373_line_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1373_line_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        int val = 0;
        
        spin_lock_irq(&ensoniq->reg_lock);
@@ -1530,9 +1560,10 @@ static int snd_es1373_line_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
        return 0;
 }
 
-static int snd_es1373_line_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_es1373_line_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        int changed;
        unsigned int ctrl;
        
@@ -1549,7 +1580,7 @@ static int snd_es1373_line_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
        return changed;
 }
 
-static snd_kcontrol_new_t snd_ens1373_line __devinitdata =
+static struct snd_kcontrol_new snd_ens1373_line __devinitdata =
 {
        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
        .name =         "Line In->Rear Out Switch",
@@ -1558,9 +1589,9 @@ static snd_kcontrol_new_t snd_ens1373_line __devinitdata =
        .put =          snd_es1373_line_put,
 };
 
-static void snd_ensoniq_mixer_free_ac97(ac97_t *ac97)
+static void snd_ensoniq_mixer_free_ac97(struct snd_ac97 *ac97)
 {
-       ensoniq_t *ensoniq = ac97->private_data;
+       struct ensoniq *ensoniq = ac97->private_data;
        ensoniq->u.es1371.ac97 = NULL;
 }
 
@@ -1577,13 +1608,13 @@ static struct {
        { .vid = PCI_ANY_ID, .did = PCI_ANY_ID }
 };
 
-static int snd_ensoniq_1371_mixer(ensoniq_t * ensoniq)
+static int snd_ensoniq_1371_mixer(struct ensoniq * ensoniq)
 {
-       snd_card_t *card = ensoniq->card;
-       ac97_bus_t *pbus;
-       ac97_template_t ac97;
+       struct snd_card *card = ensoniq->card;
+       struct snd_ac97_bus *pbus;
+       struct snd_ac97_template ac97;
        int err, idx;
-       static ac97_bus_ops_t ops = {
+       static struct snd_ac97_bus_ops ops = {
                .write = snd_es1371_codec_write,
                .read = snd_es1371_codec_read,
                .wait = snd_es1371_codec_wait,
@@ -1602,10 +1633,11 @@ static int snd_ensoniq_1371_mixer(ensoniq_t * ensoniq)
                if (ensoniq->pci->vendor == es1371_spdif_present[idx].vid &&
                    ensoniq->pci->device == es1371_spdif_present[idx].did &&
                    ensoniq->rev == es1371_spdif_present[idx].rev) {
-                       snd_kcontrol_t *kctl;
+                       struct snd_kcontrol *kctl;
                        int i, index = 0; 
 
-                       ensoniq->spdif_default = ensoniq->spdif_stream = SNDRV_PCM_DEFAULT_CON_SPDIF;
+                       ensoniq->spdif_default = ensoniq->spdif_stream =
+                               SNDRV_PCM_DEFAULT_CON_SPDIF;
                        outl(ensoniq->spdif_default, ES_REG(ensoniq, CHANNEL_STATUS));
 
                        if (ensoniq->u.es1371.ac97->ext_id & AC97_EI_SPDIF)
@@ -1650,7 +1682,8 @@ static int snd_ensoniq_1371_mixer(ensoniq_t * ensoniq)
   .get = snd_ensoniq_control_get, .put = snd_ensoniq_control_put, \
   .private_value = mask }
 
-static int snd_ensoniq_control_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_ensoniq_control_info(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
         uinfo->count = 1;
@@ -1659,9 +1692,10 @@ static int snd_ensoniq_control_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_
         return 0;
 }
 
-static int snd_ensoniq_control_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ensoniq_control_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        int mask = kcontrol->private_value;
        
        spin_lock_irq(&ensoniq->reg_lock);
@@ -1670,9 +1704,10 @@ static int snd_ensoniq_control_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
        return 0;
 }
 
-static int snd_ensoniq_control_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_ensoniq_control_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
-       ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
+       struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);
        int mask = kcontrol->private_value;
        unsigned int nval;
        int change;
@@ -1691,23 +1726,23 @@ static int snd_ensoniq_control_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
  * ENS1370 mixer
  */
 
-static snd_kcontrol_new_t snd_es1370_controls[2] __devinitdata = {
+static struct snd_kcontrol_new snd_es1370_controls[2] __devinitdata = {
 ENSONIQ_CONTROL("PCM 0 Output also on Line-In Jack", ES_1370_XCTL0),
 ENSONIQ_CONTROL("Mic +5V bias", ES_1370_XCTL1)
 };
 
 #define ES1370_CONTROLS ARRAY_SIZE(snd_es1370_controls)
 
-static void snd_ensoniq_mixer_free_ak4531(ak4531_t *ak4531)
+static void snd_ensoniq_mixer_free_ak4531(struct snd_ak4531 *ak4531)
 {
-       ensoniq_t *ensoniq = ak4531->private_data;
+       struct ensoniq *ensoniq = ak4531->private_data;
        ensoniq->u.es1370.ak4531 = NULL;
 }
 
-static int __devinit snd_ensoniq_1370_mixer(ensoniq_t * ensoniq)
+static int __devinit snd_ensoniq_1370_mixer(struct ensoniq * ensoniq)
 {
-       snd_card_t *card = ensoniq->card;
-       ak4531_t ak4531;
+       struct snd_card *card = ensoniq->card;
+       struct snd_ak4531 ak4531;
        unsigned int idx;
        int err;
 
@@ -1761,7 +1796,7 @@ static inline int snd_ensoniq_get_joystick_port(int dev)
 }
 #endif
 
-static int __devinit snd_ensoniq_create_gameport(ensoniq_t *ensoniq, int dev)
+static int __devinit snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)
 {
        struct gameport *gp;
        int io_port;
@@ -1784,7 +1819,8 @@ static int __devinit snd_ensoniq_create_gameport(ensoniq_t *ensoniq, int dev)
 
        default:
                if (!request_region(io_port, 8, "ens137x: gameport")) {
-                       printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n", io_port);
+                       printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n",
+                              io_port);
                        return -EBUSY;
                }
                break;
@@ -1814,7 +1850,7 @@ static int __devinit snd_ensoniq_create_gameport(ensoniq_t *ensoniq, int dev)
        return 0;
 }
 
-static void snd_ensoniq_free_gameport(ensoniq_t *ensoniq)
+static void snd_ensoniq_free_gameport(struct ensoniq *ensoniq)
 {
        if (ensoniq->gameport) {
                int port = ensoniq->gameport->io;
@@ -1827,36 +1863,40 @@ static void snd_ensoniq_free_gameport(ensoniq_t *ensoniq)
        }
 }
 #else
-static inline int snd_ensoniq_create_gameport(ensoniq_t *ensoniq, long port) { return -ENOSYS; }
-static inline void snd_ensoniq_free_gameport(ensoniq_t *ensoniq) { }
+static inline int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, long port) { return -ENOSYS; }
+static inline void snd_ensoniq_free_gameport(struct ensoniq *ensoniq) { }
 #endif /* SUPPORT_JOYSTICK */
 
 /*
 
  */
 
-static void snd_ensoniq_proc_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_ensoniq_proc_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
-       ensoniq_t *ensoniq = entry->private_data;
+       struct ensoniq *ensoniq = entry->private_data;
 
 #ifdef CHIP1370
        snd_iprintf(buffer, "Ensoniq AudioPCI ES1370\n\n");
 #else
        snd_iprintf(buffer, "Ensoniq AudioPCI ES1371\n\n");
 #endif
-       snd_iprintf(buffer, "Joystick enable  : %s\n", ensoniq->ctrl & ES_JYSTK_EN ? "on" : "off");
+       snd_iprintf(buffer, "Joystick enable  : %s\n",
+                   ensoniq->ctrl & ES_JYSTK_EN ? "on" : "off");
 #ifdef CHIP1370
-       snd_iprintf(buffer, "MIC +5V bias     : %s\n", ensoniq->ctrl & ES_1370_XCTL1 ? "on" : "off");
-       snd_iprintf(buffer, "Line In to AOUT  : %s\n", ensoniq->ctrl & ES_1370_XCTL0 ? "on" : "off");
+       snd_iprintf(buffer, "MIC +5V bias     : %s\n",
+                   ensoniq->ctrl & ES_1370_XCTL1 ? "on" : "off");
+       snd_iprintf(buffer, "Line In to AOUT  : %s\n",
+                   ensoniq->ctrl & ES_1370_XCTL0 ? "on" : "off");
 #else
-       snd_iprintf(buffer, "Joystick port    : 0x%x\n", (ES_1371_JOY_ASELI(ensoniq->ctrl) * 8) + 0x200);
+       snd_iprintf(buffer, "Joystick port    : 0x%x\n",
+                   (ES_1371_JOY_ASELI(ensoniq->ctrl) * 8) + 0x200);
 #endif
 }
 
-static void __devinit snd_ensoniq_proc_init(ensoniq_t * ensoniq)
+static void __devinit snd_ensoniq_proc_init(struct ensoniq * ensoniq)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 
        if (! snd_card_proc_new(ensoniq->card, "audiopci", &entry))
                snd_info_set_text_ops(entry, ensoniq, 1024, snd_ensoniq_proc_read);
@@ -1866,7 +1906,7 @@ static void __devinit snd_ensoniq_proc_init(ensoniq_t * ensoniq)
 
  */
 
-static int snd_ensoniq_free(ensoniq_t *ensoniq)
+static int snd_ensoniq_free(struct ensoniq *ensoniq)
 {
        snd_ensoniq_free_gameport(ensoniq);
        if (ensoniq->irq < 0)
@@ -1886,16 +1926,16 @@ static int snd_ensoniq_free(ensoniq_t *ensoniq)
                snd_dma_free_pages(&ensoniq->dma_bug);
 #endif
        if (ensoniq->irq >= 0)
-               free_irq(ensoniq->irq, (void *)ensoniq);
+               free_irq(ensoniq->irq, ensoniq);
        pci_release_regions(ensoniq->pci);
        pci_disable_device(ensoniq->pci);
        kfree(ensoniq);
        return 0;
 }
 
-static int snd_ensoniq_dev_free(snd_device_t *device)
+static int snd_ensoniq_dev_free(struct snd_device *device)
 {
-       ensoniq_t *ensoniq = device->device_data;
+       struct ensoniq *ensoniq = device->device_data;
        return snd_ensoniq_free(ensoniq);
 }
 
@@ -1924,18 +1964,127 @@ static struct {
 };
 #endif
 
-static int __devinit snd_ensoniq_create(snd_card_t * card,
+static void snd_ensoniq_chip_init(struct ensoniq *ensoniq)
+{
+#ifdef CHIP1371
+       int idx;
+       struct pci_dev *pci = ensoniq->pci;
+#endif
+       /* this code was part of snd_ensoniq_create before intruduction
+         * of suspend/resume
+         */
+#ifdef CHIP1370
+       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
+       outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
+       outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));
+       outl(ensoniq->dma_bug.addr, ES_REG(ensoniq, PHANTOM_FRAME));
+       outl(0, ES_REG(ensoniq, PHANTOM_COUNT));
+#else
+       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
+       outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
+       outl(0, ES_REG(ensoniq, 1371_LEGACY));
+       for (idx = 0; es1371_ac97_reset_hack[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
+               if (pci->vendor == es1371_ac97_reset_hack[idx].vid &&
+                   pci->device == es1371_ac97_reset_hack[idx].did &&
+                   ensoniq->rev == es1371_ac97_reset_hack[idx].rev) {
+                       outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
+                       /* need to delay around 20ms(bleech) to give
+                       some CODECs enough time to wakeup */
+                       msleep(20);
+                       break;
+               }
+       /* AC'97 warm reset to start the bitclk */
+       outl(ensoniq->ctrl | ES_1371_SYNC_RES, ES_REG(ensoniq, CONTROL));
+       inl(ES_REG(ensoniq, CONTROL));
+       udelay(20);
+       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
+       /* Init the sample rate converter */
+       snd_es1371_wait_src_ready(ensoniq);     
+       outl(ES_1371_SRC_DISABLE, ES_REG(ensoniq, 1371_SMPRATE));
+       for (idx = 0; idx < 0x80; idx++)
+               snd_es1371_src_write(ensoniq, idx, 0);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_TRUNC_N, 16 << 4);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_INT_REGS, 16 << 10);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_TRUNC_N, 16 << 4);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_INT_REGS, 16 << 10);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC, 1 << 12);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC + 1, 1 << 12);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC1, 1 << 12);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC1 + 1, 1 << 12);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC2, 1 << 12);
+       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC2 + 1, 1 << 12);
+       snd_es1371_adc_rate(ensoniq, 22050);
+       snd_es1371_dac1_rate(ensoniq, 22050);
+       snd_es1371_dac2_rate(ensoniq, 22050);
+       /* WARNING:
+        * enabling the sample rate converter without properly programming
+        * its parameters causes the chip to lock up (the SRC busy bit will
+        * be stuck high, and I've found no way to rectify this other than
+        * power cycle) - Thomas Sailer
+        */
+       snd_es1371_wait_src_ready(ensoniq);
+       outl(0, ES_REG(ensoniq, 1371_SMPRATE));
+       /* try reset codec directly */
+       outl(ES_1371_CODEC_WRITE(0, 0), ES_REG(ensoniq, 1371_CODEC));
+#endif
+       outb(ensoniq->uartc = 0x00, ES_REG(ensoniq, UART_CONTROL));
+       outb(0x00, ES_REG(ensoniq, UART_RES));
+       outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
+       synchronize_irq(ensoniq->irq);
+}
+
+#ifdef CONFIG_PM
+static int snd_ensoniq_suspend(struct snd_card *card, pm_message_t state)
+{
+       struct ensoniq *ensoniq = card->pm_private_data;
+       
+       snd_pcm_suspend_all(ensoniq->pcm1);
+       snd_pcm_suspend_all(ensoniq->pcm2);
+       
+#ifdef CHIP1371        
+       if (ensoniq->u.es1371.ac97)
+               snd_ac97_suspend(ensoniq->u.es1371.ac97);
+#else
+       /* FIXME */
+#endif 
+       pci_set_power_state(ensoniq->pci, 3);
+       pci_disable_device(ensoniq->pci);
+       return 0;
+}
+
+static int snd_ensoniq_resume(struct snd_card *card)
+{
+       struct ensoniq *ensoniq = card->pm_private_data;
+
+       pci_enable_device(ensoniq->pci);
+       pci_set_power_state(ensoniq->pci, 0);   
+       pci_set_master(ensoniq->pci);
+
+       snd_ensoniq_chip_init(ensoniq);
+
+#ifdef CHIP1371        
+       if (ensoniq->u.es1371.ac97)
+               snd_ac97_resume(ensoniq->u.es1371.ac97);
+#else
+       /* FIXME */
+#endif 
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+
+static int __devinit snd_ensoniq_create(struct snd_card *card,
                                     struct pci_dev *pci,
-                                    ensoniq_t ** rensoniq)
+                                    struct ensoniq ** rensoniq)
 {
-       ensoniq_t *ensoniq;
+       struct ensoniq *ensoniq;
        unsigned short cmdw;
        unsigned char cmdb;
 #ifdef CHIP1371
        int idx;
 #endif
        int err;
-       static snd_device_ops_t ops = {
+       static struct snd_device_ops ops = {
                .dev_free =     snd_ensoniq_dev_free,
        };
 
@@ -1958,7 +2107,8 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
                return err;
        }
        ensoniq->port = pci_resource_start(pci, 0);
-       if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) {
+       if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ,
+                       "Ensoniq AudioPCI", ensoniq)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_ensoniq_free(ensoniq);
                return -EBUSY;
@@ -1981,17 +2131,12 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
        ensoniq->subsystem_device_id = cmdw;
 #ifdef CHIP1370
 #if 0
-       ensoniq->ctrl = ES_1370_CDC_EN | ES_1370_SERR_DISABLE | ES_1370_PCLKDIVO(ES_1370_SRTODIV(8000));
+       ensoniq->ctrl = ES_1370_CDC_EN | ES_1370_SERR_DISABLE |
+               ES_1370_PCLKDIVO(ES_1370_SRTODIV(8000));
 #else  /* get microphone working */
        ensoniq->ctrl = ES_1370_CDC_EN | ES_1370_PCLKDIVO(ES_1370_SRTODIV(8000));
 #endif
        ensoniq->sctrl = 0;
-       /* initialize the chips */
-       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
-       outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
-       outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));
-       outl(ensoniq->dma_bug.addr, ES_REG(ensoniq, PHANTOM_FRAME));
-       outl(0, ES_REG(ensoniq, PHANTOM_COUNT));
 #else
        ensoniq->ctrl = 0;
        ensoniq->sctrl = 0;
@@ -2002,59 +2147,16 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
                        ensoniq->ctrl |= ES_1371_GPIO_OUT(1);   /* turn amplifier on */
                        break;
                }
-       /* initialize the chips */
-       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
-       outl(ensoniq->sctrl, ES_REG(ensoniq, SERIAL));
-       outl(0, ES_REG(ensoniq, 1371_LEGACY));
        for (idx = 0; es1371_ac97_reset_hack[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
                if (pci->vendor == es1371_ac97_reset_hack[idx].vid &&
                    pci->device == es1371_ac97_reset_hack[idx].did &&
                    ensoniq->rev == es1371_ac97_reset_hack[idx].rev) {
                        ensoniq->cssr |= ES_1371_ST_AC97_RST;
-                       outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
-                       /* need to delay around 20ms(bleech) to give
-                       some CODECs enough time to wakeup */
-                       msleep(20);
                        break;
                }
-       /* AC'97 warm reset to start the bitclk */
-       outl(ensoniq->ctrl | ES_1371_SYNC_RES, ES_REG(ensoniq, CONTROL));
-       inl(ES_REG(ensoniq, CONTROL));
-       udelay(20);
-       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
-       /* Init the sample rate converter */
-       snd_es1371_wait_src_ready(ensoniq);     
-       outl(ES_1371_SRC_DISABLE, ES_REG(ensoniq, 1371_SMPRATE));
-       for (idx = 0; idx < 0x80; idx++)
-               snd_es1371_src_write(ensoniq, idx, 0);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_TRUNC_N, 16 << 4);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC1 + ES_SMPREG_INT_REGS, 16 << 10);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_TRUNC_N, 16 << 4);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_DAC2 + ES_SMPREG_INT_REGS, 16 << 10);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC, 1 << 12);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC + 1, 1 << 12);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC1, 1 << 12);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC1 + 1, 1 << 12);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC2, 1 << 12);
-       snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_DAC2 + 1, 1 << 12);
-       snd_es1371_adc_rate(ensoniq, 22050);
-       snd_es1371_dac1_rate(ensoniq, 22050);
-       snd_es1371_dac2_rate(ensoniq, 22050);
-       /* WARNING:
-        * enabling the sample rate converter without properly programming
-        * its parameters causes the chip to lock up (the SRC busy bit will
-        * be stuck high, and I've found no way to rectify this other than
-        * power cycle) - Thomas Sailer
-        */
-       snd_es1371_wait_src_ready(ensoniq);
-       outl(0, ES_REG(ensoniq, 1371_SMPRATE));
-       /* try reset codec directly */
-       outl(ES_1371_CODEC_WRITE(0, 0), ES_REG(ensoniq, 1371_CODEC));
 #endif
-       outb(ensoniq->uartc = 0x00, ES_REG(ensoniq, UART_CONTROL));
-       outb(0x00, ES_REG(ensoniq, UART_RES));
-       outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
-       synchronize_irq(ensoniq->irq);
+
+       snd_ensoniq_chip_init(ensoniq);
 
        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops)) < 0) {
                snd_ensoniq_free(ensoniq);
@@ -2063,6 +2165,8 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
 
        snd_ensoniq_proc_init(ensoniq);
 
+       snd_card_set_pm_callback(card, snd_ensoniq_suspend, snd_ensoniq_resume, ensoniq);
+
        snd_card_set_dev(card, &pci->dev);
 
        *rensoniq = ensoniq;
@@ -2073,9 +2177,9 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
  *  MIDI section
  */
 
-static void snd_ensoniq_midi_interrupt(ensoniq_t * ensoniq)
+static void snd_ensoniq_midi_interrupt(struct ensoniq * ensoniq)
 {
-       snd_rawmidi_t * rmidi = ensoniq->rmidi;
+       struct snd_rawmidi *rmidi = ensoniq->rmidi;
        unsigned char status, mask, byte;
 
        if (rmidi == NULL)
@@ -2110,9 +2214,9 @@ static void snd_ensoniq_midi_interrupt(ensoniq_t * ensoniq)
        spin_unlock(&ensoniq->reg_lock);
 }
 
-static int snd_ensoniq_midi_input_open(snd_rawmidi_substream_t * substream)
+static int snd_ensoniq_midi_input_open(struct snd_rawmidi_substream *substream)
 {
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
 
        spin_lock_irq(&ensoniq->reg_lock);
        ensoniq->uartm |= ES_MODE_INPUT;
@@ -2126,9 +2230,9 @@ static int snd_ensoniq_midi_input_open(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_midi_input_close(snd_rawmidi_substream_t * substream)
+static int snd_ensoniq_midi_input_close(struct snd_rawmidi_substream *substream)
 {
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
 
        spin_lock_irq(&ensoniq->reg_lock);
        if (!(ensoniq->uartm & ES_MODE_OUTPUT)) {
@@ -2143,9 +2247,9 @@ static int snd_ensoniq_midi_input_close(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_midi_output_open(snd_rawmidi_substream_t * substream)
+static int snd_ensoniq_midi_output_open(struct snd_rawmidi_substream *substream)
 {
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
 
        spin_lock_irq(&ensoniq->reg_lock);
        ensoniq->uartm |= ES_MODE_OUTPUT;
@@ -2159,9 +2263,9 @@ static int snd_ensoniq_midi_output_open(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_ensoniq_midi_output_close(snd_rawmidi_substream_t * substream)
+static int snd_ensoniq_midi_output_close(struct snd_rawmidi_substream *substream)
 {
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
 
        spin_lock_irq(&ensoniq->reg_lock);
        if (!(ensoniq->uartm & ES_MODE_INPUT)) {
@@ -2176,10 +2280,10 @@ static int snd_ensoniq_midi_output_close(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static void snd_ensoniq_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
+static void snd_ensoniq_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
 {
        unsigned long flags;
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
        int idx;
 
        spin_lock_irqsave(&ensoniq->reg_lock, flags);
@@ -2200,10 +2304,10 @@ static void snd_ensoniq_midi_input_trigger(snd_rawmidi_substream_t * substream,
        spin_unlock_irqrestore(&ensoniq->reg_lock, flags);
 }
 
-static void snd_ensoniq_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
+static void snd_ensoniq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
 {
        unsigned long flags;
-       ensoniq_t *ensoniq = substream->rmidi->private_data;
+       struct ensoniq *ensoniq = substream->rmidi->private_data;
        unsigned char byte;
 
        spin_lock_irqsave(&ensoniq->reg_lock, flags);
@@ -2230,23 +2334,24 @@ static void snd_ensoniq_midi_output_trigger(snd_rawmidi_substream_t * substream,
        spin_unlock_irqrestore(&ensoniq->reg_lock, flags);
 }
 
-static snd_rawmidi_ops_t snd_ensoniq_midi_output =
+static struct snd_rawmidi_ops snd_ensoniq_midi_output =
 {
        .open =         snd_ensoniq_midi_output_open,
        .close =        snd_ensoniq_midi_output_close,
        .trigger =      snd_ensoniq_midi_output_trigger,
 };
 
-static snd_rawmidi_ops_t snd_ensoniq_midi_input =
+static struct snd_rawmidi_ops snd_ensoniq_midi_input =
 {
        .open =         snd_ensoniq_midi_input_open,
        .close =        snd_ensoniq_midi_input_close,
        .trigger =      snd_ensoniq_midi_input_trigger,
 };
 
-static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmidi_t **rrawmidi)
+static int __devinit snd_ensoniq_midi(struct ensoniq * ensoniq, int device,
+                                     struct snd_rawmidi **rrawmidi)
 {
-       snd_rawmidi_t *rmidi;
+       struct snd_rawmidi *rmidi;
        int err;
 
        if (rrawmidi)
@@ -2260,7 +2365,8 @@ static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmi
 #endif
        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_ensoniq_midi_output);
        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_ensoniq_midi_input);
-       rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;
+       rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT |
+               SNDRV_RAWMIDI_INFO_DUPLEX;
        rmidi->private_data = ensoniq;
        ensoniq->rmidi = rmidi;
        if (rrawmidi)
@@ -2274,7 +2380,7 @@ static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmi
 
 static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-       ensoniq_t *ensoniq = dev_id;
+       struct ensoniq *ensoniq = dev_id;
        unsigned int status, sctrl;
 
        if (ensoniq == NULL)
@@ -2311,8 +2417,8 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
                                        const struct pci_device_id *pci_id)
 {
        static int dev;
-       snd_card_t *card;
-       ensoniq_t *ensoniq;
+       struct snd_card *card;
+       struct ensoniq *ensoniq;
        int err, pcm_devs[2];
 
        if (dev >= SNDRV_CARDS)
@@ -2389,6 +2495,7 @@ static struct pci_driver driver = {
        .id_table = snd_audiopci_ids,
        .probe = snd_audiopci_probe,
        .remove = __devexit_p(snd_audiopci_remove),
+       SND_PCI_PM_CALLBACKS
 };
        
 static int __init alsa_card_ens137x_init(void)