cpuset: use seq_*mask_* to print masks
[linux-2.6.git] / sound / i2c / cs8427.c
index 1a05cfbdc7c6ec96fb876f8e5e92d5032828f141..020a5d5124721a54ef81b2c5b97943580699a19c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  Routines for control of the CS8427 via i2c bus
  *  IEC958 (S/PDIF) receiver & transmitter by Cirrus Logic
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
  *
  */
 
-#include <sound/driver.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <asm/unaligned.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/cs8427.h>
 #include <sound/asoundef.h>
 
-static void snd_cs8427_reset(snd_i2c_device_t *cs8427);
+static void snd_cs8427_reset(struct snd_i2c_device *cs8427);
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("IEC958 (S/PDIF) receiver & transmitter by Cirrus Logic");
 MODULE_LICENSE("GPL");
 
 #define CS8427_ADDR                    (0x20>>1) /* fixed address */
 
-typedef struct {
-       snd_pcm_substream_t *substream;
+struct cs8427_stream {
+       struct snd_pcm_substream *substream;
        char hw_status[24];             /* hardware status */
        char def_status[24];            /* default status */
        char pcm_status[24];            /* PCM private status */
        char hw_udata[32];
-       snd_kcontrol_t *pcm_ctl;
-} cs8427_stream_t;
+       struct snd_kcontrol *pcm_ctl;
+};
 
-typedef struct {
+struct cs8427 {
        unsigned char regmap[0x14];     /* map of first 1 + 13 registers */
        unsigned int rate;
        unsigned int reset_timeout;
-       cs8427_stream_t playback;
-       cs8427_stream_t capture;
-} cs8427_t;
+       struct cs8427_stream playback;
+       struct cs8427_stream capture;
+};
 
 static unsigned char swapbits(unsigned char val)
 {
@@ -67,7 +67,8 @@ static unsigned char swapbits(unsigned char val)
        return res;
 }
 
-int snd_cs8427_reg_write(snd_i2c_device_t *device, unsigned char reg, unsigned char val)
+int snd_cs8427_reg_write(struct snd_i2c_device *device, unsigned char reg,
+                        unsigned char val)
 {
        int err;
        unsigned char buf[2];
@@ -75,51 +76,58 @@ int snd_cs8427_reg_write(snd_i2c_device_t *device, unsigned char reg, unsigned c
        buf[0] = reg & 0x7f;
        buf[1] = val;
        if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) {
-               snd_printk(KERN_ERR "unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n", buf[0], buf[1], err);
+               snd_printk(KERN_ERR "unable to send bytes 0x%02x:0x%02x "
+                          "to CS8427 (%i)\n", buf[0], buf[1], err);
                return err < 0 ? err : -EIO;
        }
        return 0;
 }
 
-static int snd_cs8427_reg_read(snd_i2c_device_t *device, unsigned char reg)
+EXPORT_SYMBOL(snd_cs8427_reg_write);
+
+static int snd_cs8427_reg_read(struct snd_i2c_device *device, unsigned char reg)
 {
        int err;
        unsigned char buf;
 
        if ((err = snd_i2c_sendbytes(device, &reg, 1)) != 1) {
-               snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg);
+               snd_printk(KERN_ERR "unable to send register 0x%x byte "
+                          "to CS8427\n", reg);
                return err < 0 ? err : -EIO;
        }
        if ((err = snd_i2c_readbytes(device, &buf, 1)) != 1) {
-               snd_printk(KERN_ERR "unable to read register 0x%x byte from CS8427\n", reg);
+               snd_printk(KERN_ERR "unable to read register 0x%x byte "
+                          "from CS8427\n", reg);
                return err < 0 ? err : -EIO;
        }
        return buf;
 }
 
-static int snd_cs8427_select_corudata(snd_i2c_device_t *device, int udata)
+static int snd_cs8427_select_corudata(struct snd_i2c_device *device, int udata)
 {
-       cs8427_t *chip = device->private_data;
+       struct cs8427 *chip = device->private_data;
        int err;
 
        udata = udata ? CS8427_BSEL : 0;
        if (udata != (chip->regmap[CS8427_REG_CSDATABUF] & udata)) {
                chip->regmap[CS8427_REG_CSDATABUF] &= ~CS8427_BSEL;
                chip->regmap[CS8427_REG_CSDATABUF] |= udata;
-               err = snd_cs8427_reg_write(device, CS8427_REG_CSDATABUF, chip->regmap[CS8427_REG_CSDATABUF]);
+               err = snd_cs8427_reg_write(device, CS8427_REG_CSDATABUF,
+                                          chip->regmap[CS8427_REG_CSDATABUF]);
                if (err < 0)
                        return err;
        }
        return 0;
 }
 
-static int snd_cs8427_send_corudata(snd_i2c_device_t *device,
+static int snd_cs8427_send_corudata(struct snd_i2c_device *device,
                                    int udata,
                                    unsigned char *ndata,
                                    int count)
 {
-       cs8427_t *chip = device->private_data;
-       char *hw_data = udata ? chip->playback.hw_udata : chip->playback.hw_status;
+       struct cs8427 *chip = device->private_data;
+       char *hw_data = udata ?
+               chip->playback.hw_udata : chip->playback.hw_status;
        char data[32];
        int err, idx;
 
@@ -132,10 +140,11 @@ static int snd_cs8427_send_corudata(snd_i2c_device_t *device,
                memset(data, 0, sizeof(data));
                if (memcmp(hw_data, data, count) == 0) {
                        chip->regmap[CS8427_REG_UDATABUF] &= ~CS8427_UBMMASK;
-                       chip->regmap[CS8427_REG_UDATABUF] |= CS8427_UBMZEROS | CS8427_EFTUI;
-                       if ((err = snd_cs8427_reg_write(device, CS8427_REG_UDATABUF, chip->regmap[CS8427_REG_UDATABUF])) < 0)
-                               return err;
-                       return 0;
+                       chip->regmap[CS8427_REG_UDATABUF] |= CS8427_UBMZEROS |
+                               CS8427_EFTUI;
+                       err = snd_cs8427_reg_write(device, CS8427_REG_UDATABUF,
+                                                  chip->regmap[CS8427_REG_UDATABUF]);
+                       return err < 0 ? err : 0;
                }
        }
        data[0] = CS8427_REG_AUTOINC | CS8427_REG_CORU_DATABUF;
@@ -146,36 +155,44 @@ static int snd_cs8427_send_corudata(snd_i2c_device_t *device,
        return 1;
 }
 
-static void snd_cs8427_free(snd_i2c_device_t *device)
+static void snd_cs8427_free(struct snd_i2c_device *device)
 {
        kfree(device->private_data);
 }
 
-int snd_cs8427_create(snd_i2c_bus_t *bus,
+int snd_cs8427_create(struct snd_i2c_bus *bus,
                      unsigned char addr,
                      unsigned int reset_timeout,
-                     snd_i2c_device_t **r_cs8427)
+                     struct snd_i2c_device **r_cs8427)
 {
        static unsigned char initvals1[] = {
          CS8427_REG_CONTROL1 | CS8427_REG_AUTOINC,
-         /* CS8427_REG_CONTROL1: RMCK to OMCK, valid PCM audio, disable mutes, TCBL=output */
+         /* CS8427_REG_CONTROL1: RMCK to OMCK, valid PCM audio, disable mutes,
+            TCBL=output */
          CS8427_SWCLK | CS8427_TCBLDIR,
-         /* CS8427_REG_CONTROL2: hold last valid audio sample, RMCK=256*Fs, normal stereo operation */
+         /* CS8427_REG_CONTROL2: hold last valid audio sample, RMCK=256*Fs,
+            normal stereo operation */
          0x00,
-         /* CS8427_REG_DATAFLOW: output drivers normal operation, Tx<=serial, Rx=>serial */
+         /* CS8427_REG_DATAFLOW: output drivers normal operation, Tx<=serial,
+            Rx=>serial */
          CS8427_TXDSERIAL | CS8427_SPDAES3RECEIVER,
-         /* CS8427_REG_CLOCKSOURCE: Run off, CMCK=256*Fs, output time base = OMCK, input time base =
-            recovered input clock, recovered input clock source is ILRCK changed to AES3INPUT (workaround, see snd_cs8427_reset) */
+         /* CS8427_REG_CLOCKSOURCE: Run off, CMCK=256*Fs,
+            output time base = OMCK, input time base = recovered input clock,
+            recovered input clock source is ILRCK changed to AES3INPUT
+            (workaround, see snd_cs8427_reset) */
          CS8427_RXDILRCK,
-         /* CS8427_REG_SERIALINPUT: Serial audio input port data format = I2S, 24-bit, 64*Fsi */
+         /* CS8427_REG_SERIALINPUT: Serial audio input port data format = I2S,
+            24-bit, 64*Fsi */
          CS8427_SIDEL | CS8427_SILRPOL,
-         /* CS8427_REG_SERIALOUTPUT: Serial audio output port data format = I2S, 24-bit, 64*Fsi */
+         /* CS8427_REG_SERIALOUTPUT: Serial audio output port data format
+            = I2S, 24-bit, 64*Fsi */
          CS8427_SODEL | CS8427_SOLRPOL,
        };
        static unsigned char initvals2[] = {
          CS8427_REG_RECVERRMASK | CS8427_REG_AUTOINC,
-         /* CS8427_REG_RECVERRMASK: unmask the input PLL clock, V, confidence, biphase, parity status bits */
-         /* CS8427_UNLOCK | CS8427_V | CS8427_CONF | CS8427_BIP | CS8427_PAR, */
+         /* CS8427_REG_RECVERRMASK: unmask the input PLL clock, V, confidence,
+            biphase, parity status bits */
+         /* CS8427_UNLOCK | CS8427_V | CS8427_CONF | CS8427_BIP | CS8427_PAR,*/
          0xff, /* set everything */
          /* CS8427_REG_CSDATABUF:
             Registers 32-55 window to CS buffer
@@ -194,11 +211,13 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
          CS8427_UD | CS8427_EFTUI | CS8427_DETUI,
        };
        int err;
-       cs8427_t *chip;
-       snd_i2c_device_t *device;
+       struct cs8427 *chip;
+       struct snd_i2c_device *device;
        unsigned char buf[24];
 
-       if ((err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr & 7), &device)) < 0)
+       if ((err = snd_i2c_device_create(bus, "CS8427",
+                                        CS8427_ADDR | (addr & 7),
+                                        &device)) < 0)
                return err;
        chip = device->private_data = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (chip == NULL) {
@@ -208,13 +227,24 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
        device->private_free = snd_cs8427_free;
        
        snd_i2c_lock(bus);
-       if ((err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER)) != CS8427_VER8427A) {
+       err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);
+       if (err != CS8427_VER8427A) {
+               /* give second chance */
+               snd_printk(KERN_WARNING "invalid CS8427 signature 0x%x: "
+                          "let me try again...\n", err);
+               err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);
+       }
+       if (err != CS8427_VER8427A) {
                snd_i2c_unlock(bus);
-               snd_printk(KERN_ERR "unable to find CS8427 signature (expected 0x%x, read 0x%x), initialization is not completed\n", CS8427_VER8427A, err);
+               snd_printk(KERN_ERR "unable to find CS8427 signature "
+                          "(expected 0x%x, read 0x%x),\n",
+                          CS8427_VER8427A, err);
+               snd_printk(KERN_ERR "   initialization is not completed\n");
                return -EFAULT;
        }
        /* turn off run bit while making changes to configuration */
-       if ((err = snd_cs8427_reg_write(device, CS8427_REG_CLOCKSOURCE, 0x00)) < 0)
+       err = snd_cs8427_reg_write(device, CS8427_REG_CLOCKSOURCE, 0x00);
+       if (err < 0)
                goto __fail;
        /* send initial values */
        memcpy(chip->regmap + (initvals1[0] & 0x7f), initvals1 + 1, 6);
@@ -235,10 +265,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
                goto __fail;
        }
        /* write default channel status bytes */
-       buf[0] = ((unsigned char)(SNDRV_PCM_DEFAULT_CON_SPDIF >> 0));
-       buf[1] = ((unsigned char)(SNDRV_PCM_DEFAULT_CON_SPDIF >> 8));
-       buf[2] = ((unsigned char)(SNDRV_PCM_DEFAULT_CON_SPDIF >> 16));
-       buf[3] = ((unsigned char)(SNDRV_PCM_DEFAULT_CON_SPDIF >> 24));
+       put_unaligned_le32(SNDRV_PCM_DEFAULT_CON_SPDIF, buf);
        memset(buf + 4, 0, 24 - 4);
        if (snd_cs8427_send_corudata(device, 0, buf, 24) < 0)
                goto __fail;
@@ -274,25 +301,33 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
        return err < 0 ? err : -EIO;
 }
 
+EXPORT_SYMBOL(snd_cs8427_create);
+
 /*
  * Reset the chip using run bit, also lock PLL using ILRCK and
  * put back AES3INPUT. This workaround is described in latest
  * CS8427 datasheet, otherwise TXDSERIAL will not work.
  */
-static void snd_cs8427_reset(snd_i2c_device_t *cs8427)
+static void snd_cs8427_reset(struct snd_i2c_device *cs8427)
 {
-       cs8427_t *chip;
+       struct cs8427 *chip;
        unsigned long end_time;
-       int data;
+       int data, aes3input = 0;
 
-       snd_assert(cs8427, return);
+       if (snd_BUG_ON(!cs8427))
+               return;
        chip = cs8427->private_data;
        snd_i2c_lock(cs8427->bus);
+       if ((chip->regmap[CS8427_REG_CLOCKSOURCE] & CS8427_RXDAES3INPUT) ==
+           CS8427_RXDAES3INPUT)  /* AES3 bit is set */
+               aes3input = 1;
        chip->regmap[CS8427_REG_CLOCKSOURCE] &= ~(CS8427_RUN | CS8427_RXDMASK);
-       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE, chip->regmap[CS8427_REG_CLOCKSOURCE]);
+       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE,
+                            chip->regmap[CS8427_REG_CLOCKSOURCE]);
        udelay(200);
        chip->regmap[CS8427_REG_CLOCKSOURCE] |= CS8427_RUN | CS8427_RXDILRCK;
-       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE, chip->regmap[CS8427_REG_CLOCKSOURCE]);
+       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE,
+                            chip->regmap[CS8427_REG_CLOCKSOURCE]);
        udelay(200);
        snd_i2c_unlock(cs8427->bus);
        end_time = jiffies + chip->reset_timeout;
@@ -306,13 +341,15 @@ static void snd_cs8427_reset(snd_i2c_device_t *cs8427)
        }
        snd_i2c_lock(cs8427->bus);
        chip->regmap[CS8427_REG_CLOCKSOURCE] &= ~CS8427_RXDMASK;
-       chip->regmap[CS8427_REG_CLOCKSOURCE] |= CS8427_RXDAES3INPUT;
-       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE, chip->regmap[CS8427_REG_CLOCKSOURCE]);
+       if (aes3input)
+               chip->regmap[CS8427_REG_CLOCKSOURCE] |= CS8427_RXDAES3INPUT;
+       snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE,
+                            chip->regmap[CS8427_REG_CLOCKSOURCE]);
        snd_i2c_unlock(cs8427->bus);
 }
 
-static int snd_cs8427_in_status_info(snd_kcontrol_t *kcontrol,
-                                    snd_ctl_elem_info_t *uinfo)
+static int snd_cs8427_in_status_info(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
        uinfo->count = 1;
@@ -321,10 +358,10 @@ static int snd_cs8427_in_status_info(snd_kcontrol_t *kcontrol,
        return 0;
 }
 
-static int snd_cs8427_in_status_get(snd_kcontrol_t *kcontrol,
-                                   snd_ctl_elem_value_t *ucontrol)
+static int snd_cs8427_in_status_get(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_value *ucontrol)
 {
-       snd_i2c_device_t *device = snd_kcontrol_chip(kcontrol);
+       struct snd_i2c_device *device = snd_kcontrol_chip(kcontrol);
        int data;
 
        snd_i2c_lock(device->bus);
@@ -336,29 +373,32 @@ static int snd_cs8427_in_status_get(snd_kcontrol_t *kcontrol,
        return 0;
 }
 
-static int snd_cs8427_qsubcode_info(snd_kcontrol_t *kcontrol,
-                                   snd_ctl_elem_info_t *uinfo)
+static int snd_cs8427_qsubcode_info(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
        uinfo->count = 10;
        return 0;
 }
 
-static int snd_cs8427_qsubcode_get(snd_kcontrol_t *kcontrol,
-                                  snd_ctl_elem_value_t *ucontrol)
+static int snd_cs8427_qsubcode_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
-       snd_i2c_device_t *device = snd_kcontrol_chip(kcontrol);
+       struct snd_i2c_device *device = snd_kcontrol_chip(kcontrol);
        unsigned char reg = CS8427_REG_QSUBCODE;
        int err;
 
        snd_i2c_lock(device->bus);
        if ((err = snd_i2c_sendbytes(device, &reg, 1)) != 1) {
-               snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg);
+               snd_printk(KERN_ERR "unable to send register 0x%x byte "
+                          "to CS8427\n", reg);
                snd_i2c_unlock(device->bus);
                return err < 0 ? err : -EIO;
        }
-       if ((err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10)) != 10) {
-               snd_printk(KERN_ERR "unable to read Q-subcode bytes from CS8427\n");
+       err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10);
+       if (err != 10) {
+               snd_printk(KERN_ERR "unable to read Q-subcode bytes "
+                          "from CS8427\n");
                snd_i2c_unlock(device->bus);
                return err < 0 ? err : -EIO;
        }
@@ -366,18 +406,19 @@ static int snd_cs8427_qsubcode_get(snd_kcontrol_t *kcontrol,
        return 0;
 }
 
-static int snd_cs8427_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_cs8427_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_cs8427_spdif_get(snd_kcontrol_t * kcontrol,
-                               snd_ctl_elem_value_t * ucontrol)
+static int snd_cs8427_spdif_get(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
 {
-       snd_i2c_device_t *device = snd_kcontrol_chip(kcontrol);
-       cs8427_t *chip = device->private_data;
+       struct snd_i2c_device *device = snd_kcontrol_chip(kcontrol);
+       struct cs8427 *chip = device->private_data;
        
        snd_i2c_lock(device->bus);
        memcpy(ucontrol->value.iec958.status, chip->playback.def_status, 24);
@@ -385,19 +426,22 @@ static int snd_cs8427_spdif_get(snd_kcontrol_t * kcontrol,
        return 0;
 }
 
-static int snd_cs8427_spdif_put(snd_kcontrol_t * kcontrol,
-                               snd_ctl_elem_value_t * ucontrol)
+static int snd_cs8427_spdif_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
 {
-       snd_i2c_device_t *device = snd_kcontrol_chip(kcontrol);
-       cs8427_t *chip = device->private_data;
-       unsigned char *status = kcontrol->private_value ? chip->playback.pcm_status : chip->playback.def_status;
-       snd_pcm_runtime_t *runtime = chip->playback.substream ? chip->playback.substream->runtime : NULL;
+       struct snd_i2c_device *device = snd_kcontrol_chip(kcontrol);
+       struct cs8427 *chip = device->private_data;
+       unsigned char *status = kcontrol->private_value ?
+               chip->playback.pcm_status : chip->playback.def_status;
+       struct snd_pcm_runtime *runtime = chip->playback.substream ?
+               chip->playback.substream->runtime : NULL;
        int err, change;
 
        snd_i2c_lock(device->bus);
        change = memcmp(ucontrol->value.iec958.status, status, 24) != 0;
        memcpy(status, ucontrol->value.iec958.status, 24);
-       if (change && (kcontrol->private_value ? runtime != NULL : runtime == NULL)) {
+       if (change && (kcontrol->private_value ?
+                      runtime != NULL : runtime == NULL)) {
                err = snd_cs8427_send_corudata(device, 0, status, 24);
                if (err < 0)
                        change = err;
@@ -406,26 +450,28 @@ static int snd_cs8427_spdif_put(snd_kcontrol_t * kcontrol,
        return change;
 }
 
-static int snd_cs8427_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_cs8427_spdif_mask_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_cs8427_spdif_mask_get(snd_kcontrol_t * kcontrol,
-                                     snd_ctl_elem_value_t * ucontrol)
+static int snd_cs8427_spdif_mask_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
 {
        memset(ucontrol->value.iec958.status, 0xff, 24);
        return 0;
 }
 
-static snd_kcontrol_new_t snd_cs8427_iec958_controls[] = {
+static struct snd_kcontrol_new snd_cs8427_iec958_controls[] = {
 {
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .info =         snd_cs8427_in_status_info,
        .name =         "IEC958 CS8427 Input Status",
-       .access =       SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+       .access =       (SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE),
        .get =          snd_cs8427_in_status_get,
        .private_value = 15,
 },
@@ -433,7 +479,8 @@ static snd_kcontrol_new_t snd_cs8427_iec958_controls[] = {
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .info =         snd_cs8427_in_status_info,
        .name =         "IEC958 CS8427 Error Status",
-       .access =       SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+       .access =       (SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE),
        .get =          snd_cs8427_in_status_get,
        .private_value = 16,
 },
@@ -453,7 +500,8 @@ static snd_kcontrol_new_t snd_cs8427_iec958_controls[] = {
        .private_value = 0
 },
 {
-       .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+       .access =       (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                        SNDRV_CTL_ELEM_ACCESS_INACTIVE),
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
        .info =         snd_cs8427_spdif_info,
@@ -465,20 +513,22 @@ static snd_kcontrol_new_t snd_cs8427_iec958_controls[] = {
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .info =         snd_cs8427_qsubcode_info,
        .name =         "IEC958 Q-subcode Capture Default",
-       .access =       SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+       .access =       (SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE),
        .get =          snd_cs8427_qsubcode_get
 }};
 
-int snd_cs8427_iec958_build(snd_i2c_device_t *cs8427,
-                           snd_pcm_substream_t *play_substream,
-                           snd_pcm_substream_t *cap_substream)
+int snd_cs8427_iec958_build(struct snd_i2c_device *cs8427,
+                           struct snd_pcm_substream *play_substream,
+                           struct snd_pcm_substream *cap_substream)
 {
-       cs8427_t *chip = cs8427->private_data;
-       snd_kcontrol_t *kctl;
+       struct cs8427 *chip = cs8427->private_data;
+       struct snd_kcontrol *kctl;
        unsigned int idx;
        int err;
 
-       snd_assert(play_substream && cap_substream, return -EINVAL);
+       if (snd_BUG_ON(!play_substream || !cap_substream))
+               return -EINVAL;
        for (idx = 0; idx < ARRAY_SIZE(snd_cs8427_iec958_controls); idx++) {
                kctl = snd_ctl_new1(&snd_cs8427_iec958_controls[idx], cs8427);
                if (kctl == NULL)
@@ -488,37 +538,47 @@ int snd_cs8427_iec958_build(snd_i2c_device_t *cs8427,
                err = snd_ctl_add(cs8427->bus->card, kctl);
                if (err < 0)
                        return err;
-               if (!strcmp(kctl->id.name, SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM)))
+               if (! strcmp(kctl->id.name,
+                            SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM)))
                        chip->playback.pcm_ctl = kctl;
        }
 
        chip->playback.substream = play_substream;
        chip->capture.substream = cap_substream;
-       snd_assert(chip->playback.pcm_ctl, return -EIO);
+       if (snd_BUG_ON(!chip->playback.pcm_ctl))
+               return -EIO;
        return 0;
 }
 
-int snd_cs8427_iec958_active(snd_i2c_device_t *cs8427, int active)
+EXPORT_SYMBOL(snd_cs8427_iec958_build);
+
+int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active)
 {
-       cs8427_t *chip;
+       struct cs8427 *chip;
 
-       snd_assert(cs8427, return -ENXIO);
+       if (snd_BUG_ON(!cs8427))
+               return -ENXIO;
        chip = cs8427->private_data;
        if (active)
-               memcpy(chip->playback.pcm_status, chip->playback.def_status, 24);
+               memcpy(chip->playback.pcm_status,
+                      chip->playback.def_status, 24);
        chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-       snd_ctl_notify(cs8427->bus->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                                         SNDRV_CTL_EVENT_MASK_INFO, &chip->playback.pcm_ctl->id);
+       snd_ctl_notify(cs8427->bus->card,
+                      SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,
+                      &chip->playback.pcm_ctl->id);
        return 0;
 }
 
-int snd_cs8427_iec958_pcm(snd_i2c_device_t *cs8427, unsigned int rate)
+EXPORT_SYMBOL(snd_cs8427_iec958_active);
+
+int snd_cs8427_iec958_pcm(struct snd_i2c_device *cs8427, unsigned int rate)
 {
-       cs8427_t *chip;
+       struct cs8427 *chip;
        char *status;
        int err, reset;
 
-       snd_assert(cs8427, return -ENXIO);
+       if (snd_BUG_ON(!cs8427))
+               return -ENXIO;
        chip = cs8427->private_data;
        status = chip->playback.pcm_status;
        snd_i2c_lock(cs8427->bus);
@@ -551,6 +611,8 @@ int snd_cs8427_iec958_pcm(snd_i2c_device_t *cs8427, unsigned int rate)
        return err < 0 ? err : 0;
 }
 
+EXPORT_SYMBOL(snd_cs8427_iec958_pcm);
+
 static int __init alsa_cs8427_module_init(void)
 {
        return 0;
@@ -562,10 +624,3 @@ static void __exit alsa_cs8427_module_exit(void)
 
 module_init(alsa_cs8427_module_init)
 module_exit(alsa_cs8427_module_exit)
-
-EXPORT_SYMBOL(snd_cs8427_create);
-EXPORT_SYMBOL(snd_cs8427_reset);
-EXPORT_SYMBOL(snd_cs8427_reg_write);
-EXPORT_SYMBOL(snd_cs8427_iec958_build);
-EXPORT_SYMBOL(snd_cs8427_iec958_active);
-EXPORT_SYMBOL(snd_cs8427_iec958_pcm);