[PATCH] [UBUNTU:sound] Restore xxx_t typedefs for compatibility in pci/hda/patch_analog.c

[crimsun at fungus.sh.nu]

UpstreamStatus: Not merged

This patch restores the remaining xxx_t typedefs for compatibility in
pci/hda/patch_analog.c (missed a few in the previous commit).

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/hda/patch_analog.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

ea44fa69b29bf6b7128f848f513837daa811101c
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 30561cb..0bf24f9 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -334,7 +334,7 @@ static struct hda_codec_ops ad198x_patch
  * EAPD control
  * the private value = nid | (invert << 8)
  */
-static int ad198x_eapd_info(struct snd_kcontrol *kcontrol,
+static int ad198x_eapd_info(snd_kcontrol_t *kcontrol,
 			    snd_ctl_elem_info_t *uinfo)
 {
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -344,7 +344,7 @@ static int ad198x_eapd_info(struct snd_k
 	return 0;
 }
 
-static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,
+static int ad198x_eapd_get(snd_kcontrol_t *kcontrol,
 			   snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -357,7 +357,7 @@ static int ad198x_eapd_get(struct snd_kc
 	return 0;
 }
 
-static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
+static int ad198x_eapd_put(snd_kcontrol_t *kcontrol,
 			   snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -915,7 +915,7 @@ static struct hda_verb ad1981_hp_init_ve
 };
 
 /* turn on/off EAPD (+ mute HP) as a master switch */
-static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,
+static int ad1981_hp_master_sw_put(snd_kcontrol_t *kcontrol,
 				   snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -933,7 +933,7 @@ static int ad1981_hp_master_sw_put(struc
 }
 
 /* bind volumes of both NID 0x05 and 0x06 */
-static int ad1981_hp_master_vol_put(struct snd_kcontrol *kcontrol,
+static int ad1981_hp_master_vol_put(snd_kcontrol_t *kcontrol,
 				    snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1281,7 +1281,7 @@ static struct hda_input_mux ad1988_lapto
 
 /*
  */
-static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,
+static int ad198x_ch_mode_info(snd_kcontrol_t *kcontrol,
 			       snd_ctl_elem_info_t *uinfo)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1290,7 +1290,7 @@ static int ad198x_ch_mode_info(struct sn
 				    spec->num_channel_mode);
 }
 
-static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol,
+static int ad198x_ch_mode_get(snd_kcontrol_t *kcontrol,
 			      snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1299,7 +1299,7 @@ static int ad198x_ch_mode_get(struct snd
 				   spec->num_channel_mode, spec->multiout.max_channels);
 }
 
-static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
+static int ad198x_ch_mode_put(snd_kcontrol_t *kcontrol,
 			      snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1463,7 +1463,7 @@ static snd_kcontrol_new_t ad1988_capture
 	{ } /* end */
 };
 
-static int ad1988_spdif_playback_source_info(struct snd_kcontrol *kcontrol,
+static int ad1988_spdif_playback_source_info(snd_kcontrol_t *kcontrol,
 					     snd_ctl_elem_info_t *uinfo)
 {
 	static char *texts[] = {
@@ -1478,7 +1478,7 @@ static int ad1988_spdif_playback_source_
 	return 0;
 }
 
-static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol,
+static int ad1988_spdif_playback_source_get(snd_kcontrol_t *kcontrol,
 					    snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -1496,7 +1496,7 @@ static int ad1988_spdif_playback_source_
 	return 0;
 }
 
-static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
+static int ad1988_spdif_playback_source_put(snd_kcontrol_t *kcontrol,
 					    snd_ctl_elem_value_t *ucontrol)
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-- 
1.1.3

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060310/59c2d573/attachment.sig>