3 files changed, 36 insertions, 40 deletions

diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index f3f2c3e5ae51..11702aa0bea9 100644
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -163,10 +163,8 @@
 typedef void (ak4114_write_t)(void *private_data, unsigned char addr, unsigned char data);
 typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);
 
-typedef struct ak4114 ak4114_t;
-
 struct ak4114 {
-        snd_card_t * card;
+        struct snd_card *card;
         ak4114_write_t * write;
         ak4114_read_t * read;
         void * private_data;
@@ -174,9 +172,9 @@ struct ak4114 {
         spinlock_t lock;
         unsigned char regmap[7];
         unsigned char txcsb[5];
-        snd_kcontrol_t *kctls[AK4114_CONTROLS];
-        snd_pcm_substream_t *playback_substream;
-        snd_pcm_substream_t *capture_substream;
+        struct snd_kcontrol *kctls[AK4114_CONTROLS];
+        struct snd_pcm_substream *playback_substream;
+        struct snd_pcm_substream *capture_substream;
         unsigned long parity_errors;
         unsigned long v_bit_errors;
         unsigned long qcrc_errors;
@@ -186,20 +184,20 @@ struct ak4114 {
         struct workqueue_struct *workqueue;
         struct work_struct work;
         void *change_callback_private;
-        void (*change_callback)(ak4114_t *ak4114, unsigned char c0, unsigned char c1);
+        void (*change_callback)(struct ak4114 *ak4114, unsigned char c0, unsigned char c1);
 };
 
-int snd_ak4114_create(snd_card_t *card,
+int snd_ak4114_create(struct snd_card *card,
                       ak4114_read_t *read, ak4114_write_t *write,
                       unsigned char pgm[7], unsigned char txcsb[5],
-                      void *private_data, ak4114_t **r_ak4114);
-void snd_ak4114_reg_write(ak4114_t *ak4114, unsigned char reg, unsigned char mask, unsigned char val);
-void snd_ak4114_reinit(ak4114_t *ak4114);
-int snd_ak4114_build(ak4114_t *ak4114,
-                     snd_pcm_substream_t *playback_substream,
-                     snd_pcm_substream_t *capture_substream);
-int snd_ak4114_external_rate(ak4114_t *ak4114);
-int snd_ak4114_check_rate_and_errors(ak4114_t *ak4114, unsigned int flags);
+                      void *private_data, struct ak4114 **r_ak4114);
+void snd_ak4114_reg_write(struct ak4114 *ak4114, unsigned char reg, unsigned char mask, unsigned char val);
+void snd_ak4114_reinit(struct ak4114 *ak4114);
+int snd_ak4114_build(struct ak4114 *ak4114,
+                     struct snd_pcm_substream *playback_substream,
+                     struct snd_pcm_substream *capture_substream);
+int snd_ak4114_external_rate(struct ak4114 *ak4114);
+int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags);
 
 #endif /* __SOUND_AK4114_H */
 
diff --git a/include/sound/ak4117.h b/include/sound/ak4117.h
index 9e1dab17c33e..2b96c32f06fd 100644
--- a/include/sound/ak4117.h
+++ b/include/sound/ak4117.h
@@ -155,18 +155,16 @@
 typedef void (ak4117_write_t)(void *private_data, unsigned char addr, unsigned char data);
 typedef unsigned char (ak4117_read_t)(void *private_data, unsigned char addr);
 
-typedef struct ak4117 ak4117_t;
-
 struct ak4117 {
-        snd_card_t * card;
+        struct snd_card *card;
         ak4117_write_t * write;
         ak4117_read_t * read;
         void * private_data;
         unsigned int init: 1;
         spinlock_t lock;
         unsigned char regmap[5];
-        snd_kcontrol_t *kctls[AK4117_CONTROLS];
-        snd_pcm_substream_t *substream;
+        struct snd_kcontrol *kctls[AK4117_CONTROLS];
+        struct snd_pcm_substream *substream;
         unsigned long parity_errors;
         unsigned long v_bit_errors;
         unsigned long qcrc_errors;
@@ -176,16 +174,16 @@ struct ak4117 {
         unsigned char rcs2;
         struct timer_list timer;        /* statistic timer */
         void *change_callback_private;
-        void (*change_callback)(ak4117_t *ak4117, unsigned char c0, unsigned char c1);
+        void (*change_callback)(struct ak4117 *ak4117, unsigned char c0, unsigned char c1);
 };
 
-int snd_ak4117_create(snd_card_t *card, ak4117_read_t *read, ak4117_write_t *write,
-                      unsigned char pgm[5], void *private_data, ak4117_t **r_ak4117);
-void snd_ak4117_reg_write(ak4117_t *ak4117, unsigned char reg, unsigned char mask, unsigned char val);
-void snd_ak4117_reinit(ak4117_t *ak4117);
-int snd_ak4117_build(ak4117_t *ak4117, snd_pcm_substream_t *capture_substream);
-int snd_ak4117_external_rate(ak4117_t *ak4117);
-int snd_ak4117_check_rate_and_errors(ak4117_t *ak4117, unsigned int flags);
+int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t *write,
+                      unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117);
+void snd_ak4117_reg_write(struct ak4117 *ak4117, unsigned char reg, unsigned char mask, unsigned char val);
+void snd_ak4117_reinit(struct ak4117 *ak4117);
+int snd_ak4117_build(struct ak4117 *ak4117, struct snd_pcm_substream *capture_substream);
+int snd_ak4117_external_rate(struct ak4117 *ak4117);
+int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags);
 
 #endif /* __SOUND_AK4117_H */
 
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index e94ac0282318..3bf5911fe827 100644
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -27,20 +27,20 @@
 #define AK4XXX_MAX_CHIPS        4
 #endif
 
-typedef struct snd_akm4xxx akm4xxx_t;
+struct snd_akm4xxx;
 
 struct snd_ak4xxx_ops {
-        void (*lock)(akm4xxx_t *ak, int chip);
-        void (*unlock)(akm4xxx_t *ak, int chip);
-        void (*write)(akm4xxx_t *ak, int chip, unsigned char reg, unsigned char val);
-        // unsigned char (*read)(akm4xxx_t *ak, int chip, unsigned char reg);
-        void (*set_rate_val)(akm4xxx_t *ak, unsigned int rate);
+        void (*lock)(struct snd_akm4xxx *ak, int chip);
+        void (*unlock)(struct snd_akm4xxx *ak, int chip);
+        void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg, unsigned char val);
+        // unsigned char (*read)(struct snd_akm4xxx *ak, int chip, unsigned char reg);
+        void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
 };
 
 #define AK4XXX_IMAGE_SIZE       (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
 
 struct snd_akm4xxx {
-        snd_card_t *card;
+        struct snd_card *card;
         unsigned int num_adcs;                          /* AK4524 or AK4528 ADCs */
         unsigned int num_dacs;                          /* AK4524 or AK4528 DACs */
         unsigned char images[AK4XXX_IMAGE_SIZE];        /* saved register image */
@@ -56,10 +56,10 @@ struct snd_akm4xxx {
         struct snd_ak4xxx_ops ops;
 };
 
-void snd_akm4xxx_write(akm4xxx_t *ak, int chip, unsigned char reg, unsigned char val);
-void snd_akm4xxx_reset(akm4xxx_t *ak, int state);
-void snd_akm4xxx_init(akm4xxx_t *ak);
-int snd_akm4xxx_build_controls(akm4xxx_t *ak);
+void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg, unsigned char val);
+void snd_akm4xxx_reset(struct snd_akm4xxx *ak, int state);
+void snd_akm4xxx_init(struct snd_akm4xxx *ak);
+int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak);
 
 #define snd_akm4xxx_get(ak,chip,reg) (ak)->images[(chip) * 16 + (reg)]
 #define snd_akm4xxx_set(ak,chip,reg,val) ((ak)->images[(chip) * 16 + (reg)] = (val))