Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[linux-2.6] / sound / pci / ice1712 / ak4xxx.c

diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index ae9dc029ba0d2c4b59a00deed33f8960a7c6483f..dab31b2756a608b2e52f60c31058e4e4f19cd306 100644 (file)
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -3,7 +3,7 @@
  *
  *   AK4524 / AK4528 / AK4529 / AK4355 / AK4381 interface
  *
- *     Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *     Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
  *
  */      
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -30,20 +29,20 @@
 #include <sound/initval.h>
 #include "ice1712.h"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ICEnsemble ICE17xx <-> AK4xxx AD/DA chip interface");
 MODULE_LICENSE("GPL");
 
-static void snd_ice1712_akm4xxx_lock(akm4xxx_t *ak, int chip)
+static void snd_ice1712_akm4xxx_lock(struct snd_akm4xxx *ak, int chip)
 {
-       ice1712_t *ice = ak->private_data[0];
+       struct snd_ice1712 *ice = ak->private_data[0];
 
        snd_ice1712_save_gpio_status(ice);
 }
 
-static void snd_ice1712_akm4xxx_unlock(akm4xxx_t *ak, int chip)
+static void snd_ice1712_akm4xxx_unlock(struct snd_akm4xxx *ak, int chip)
 {
-       ice1712_t *ice = ak->private_data[0];
+       struct snd_ice1712 *ice = ak->private_data[0];
 
        snd_ice1712_restore_gpio_status(ice);
 }
@@ -51,14 +50,14 @@ static void snd_ice1712_akm4xxx_unlock(akm4xxx_t *ak, int chip)
 /*
  * write AK4xxx register
  */
-static void snd_ice1712_akm4xxx_write(akm4xxx_t *ak, int chip,
+static void snd_ice1712_akm4xxx_write(struct snd_akm4xxx *ak, int chip,
                                      unsigned char addr, unsigned char data)
 {
        unsigned int tmp;
        int idx;
        unsigned int addrdata;
        struct snd_ak4xxx_private *priv = (void *)ak->private_value[0];
-       ice1712_t *ice = ak->private_data[0];
+       struct snd_ice1712 *ice = ak->private_data[0];
 
        snd_assert(chip >= 0 && chip < 4, return);
 
@@ -119,10 +118,10 @@ static void snd_ice1712_akm4xxx_write(akm4xxx_t *ak, int chip,
 }
 
 /*
- * initialize the akm4xxx_t record with the template
+ * initialize the struct snd_akm4xxx record with the template
  */
-int snd_ice1712_akm4xxx_init(akm4xxx_t *ak, const akm4xxx_t *temp,
-                            const struct snd_ak4xxx_private *_priv, ice1712_t *ice)
+int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *temp,
+                            const struct snd_ak4xxx_private *_priv, struct snd_ice1712 *ice)
 {
        struct snd_ak4xxx_private *priv;
 
@@ -148,13 +147,13 @@ int snd_ice1712_akm4xxx_init(akm4xxx_t *ak, const akm4xxx_t *temp,
        return 0;
 }
 
-void snd_ice1712_akm4xxx_free(ice1712_t *ice)
+void snd_ice1712_akm4xxx_free(struct snd_ice1712 *ice)
 {
        unsigned int akidx;
        if (ice->akm == NULL)
                return;
        for (akidx = 0; akidx < ice->akm_codecs; akidx++) {
-               akm4xxx_t *ak = &ice->akm[akidx];
+               struct snd_akm4xxx *ak = &ice->akm[akidx];
                kfree((void*)ak->private_value[0]);
        }
        kfree(ice->akm);
@@ -163,13 +162,13 @@ void snd_ice1712_akm4xxx_free(ice1712_t *ice)
 /*
  * build AK4xxx controls
  */
-int snd_ice1712_akm4xxx_build_controls(ice1712_t *ice)
+int snd_ice1712_akm4xxx_build_controls(struct snd_ice1712 *ice)
 {
        unsigned int akidx;
        int err;
 
        for (akidx = 0; akidx < ice->akm_codecs; akidx++) {
-               akm4xxx_t *ak = &ice->akm[akidx];
+               struct snd_akm4xxx *ak = &ice->akm[akidx];
                err = snd_akm4xxx_build_controls(ak);
                if (err < 0)
                        return err;