redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

ALSA: HDA: Refactor some redundant code for Conexant 5066/205xx 

Four very similar procedures - one for each model - now
refactored into one. This isn't all duplicated code, but a step
in the right direction.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
wifi-calibration
David Henningsson 2011-01-21 13:27:39 +01:00 committed by Takashi Iwai
parent 233d84c46c
commit 02b6b5b640
1 changed files with 23 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
sound/pci/hda/patch_conexant.c
View File

@ -2387,6 +2387,21 @@ static void cxt5066_hp_automute(struct hda_codec *codec)
cxt5066_update_speaker(codec); cxt5066_update_speaker(codec);
} }
/* Dispatch the right mic autoswitch function */
static void cxt5066_automic(struct hda_codec *codec)
{
struct conexant_spec *spec = codec->spec;
if (spec->dell_vostro)
cxt5066_vostro_automic(codec);
else if (spec->ideapad)
cxt5066_ideapad_automic(codec);
else if (spec->thinkpad)
cxt5066_thinkpad_automic(codec);
else if (spec->hp_laptop)
cxt5066_hp_laptop_automic(codec);
}
/* unsolicited event for jack sensing */ /* unsolicited event for jack sensing */
static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res) static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)
{ {
@ -2405,60 +2420,19 @@ static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)
} }
/* unsolicited event for jack sensing */ /* unsolicited event for jack sensing */
static void cxt5066_vostro_event(struct hda_codec *codec, unsigned int res) static void cxt5066_unsol_event(struct hda_codec *codec, unsigned int res)
{ {
snd_printdd("CXT5066_vostro: unsol event %x (%x)\n", res, res >> 26); snd_printdd("CXT5066: unsol event %x (%x)\n", res, res >> 26);
switch (res >> 26) { switch (res >> 26) {
case CONEXANT_HP_EVENT: case CONEXANT_HP_EVENT:
cxt5066_hp_automute(codec); cxt5066_hp_automute(codec);
break; break;
case CONEXANT_MIC_EVENT: case CONEXANT_MIC_EVENT:
cxt5066_vostro_automic(codec); cxt5066_automic(codec);
break; break;
} }
} }
/* unsolicited event for jack sensing */
static void cxt5066_ideapad_event(struct hda_codec *codec, unsigned int res)
{
snd_printdd("CXT5066_ideapad: unsol event %x (%x)\n", res, res >> 26);
switch (res >> 26) {
case CONEXANT_HP_EVENT:
cxt5066_hp_automute(codec);
break;
case CONEXANT_MIC_EVENT:
cxt5066_ideapad_automic(codec);
break;
}
}
/* unsolicited event for jack sensing */
static void cxt5066_hp_laptop_event(struct hda_codec *codec, unsigned int res)
{
snd_printdd("CXT5066_hp_laptop: unsol event %x (%x)\n", res, res >> 26);
switch (res >> 26) {
case CONEXANT_HP_EVENT:
cxt5066_hp_automute(codec);
break;
case CONEXANT_MIC_EVENT:
cxt5066_hp_laptop_automic(codec);
break;
}
}
/* unsolicited event for jack sensing */
static void cxt5066_thinkpad_event(struct hda_codec *codec, unsigned int res)
{
snd_printdd("CXT5066_thinkpad: unsol event %x (%x)\n", res, res >> 26);
switch (res >> 26) {
case CONEXANT_HP_EVENT:
cxt5066_hp_automute(codec);
break;
case CONEXANT_MIC_EVENT:
cxt5066_thinkpad_automic(codec);
break;
}
}
static const struct hda_input_mux cxt5066_analog_mic_boost = { static const struct hda_input_mux cxt5066_analog_mic_boost = {
.num_items = 5, .num_items = 5,
@ -3039,20 +3013,11 @@ static struct hda_verb cxt5066_init_verbs_hp_laptop[] = {
/* initialize jack-sensing, too */ /* initialize jack-sensing, too */
static int cxt5066_init(struct hda_codec *codec) static int cxt5066_init(struct hda_codec *codec)
{ {
struct conexant_spec *spec = codec->spec;
snd_printdd("CXT5066: init\n"); snd_printdd("CXT5066: init\n");
conexant_init(codec); conexant_init(codec);
if (codec->patch_ops.unsol_event) { if (codec->patch_ops.unsol_event) {
cxt5066_hp_automute(codec); cxt5066_hp_automute(codec);
if (spec->dell_vostro) cxt5066_automic(codec);
cxt5066_vostro_automic(codec);
else if (spec->ideapad)
cxt5066_ideapad_automic(codec);
else if (spec->thinkpad)
cxt5066_thinkpad_automic(codec);
else if (spec->hp_laptop)
cxt5066_hp_laptop_automic(codec);
} }
cxt5066_set_mic_boost(codec); cxt5066_set_mic_boost(codec);
return 0; return 0;
@ -3169,7 +3134,7 @@ static int patch_cxt5066(struct hda_codec *codec)
break; break;
case CXT5066_HP_LAPTOP: case CXT5066_HP_LAPTOP:
codec->patch_ops.init = cxt5066_init; codec->patch_ops.init = cxt5066_init;
codec->patch_ops.unsol_event = cxt5066_hp_laptop_event; codec->patch_ops.unsol_event = cxt5066_unsol_event;
spec->init_verbs[spec->num_init_verbs] = spec->init_verbs[spec->num_init_verbs] =
cxt5066_init_verbs_hp_laptop; cxt5066_init_verbs_hp_laptop;
spec->num_init_verbs++; spec->num_init_verbs++;
@ -3207,7 +3172,7 @@ static int patch_cxt5066(struct hda_codec *codec)
break; break;
case CXT5066_DELL_VOSTRO: case CXT5066_DELL_VOSTRO:
codec->patch_ops.init = cxt5066_init; codec->patch_ops.init = cxt5066_init;
codec->patch_ops.unsol_event = cxt5066_vostro_event; codec->patch_ops.unsol_event = cxt5066_unsol_event;
spec->init_verbs[0] = cxt5066_init_verbs_vostro; spec->init_verbs[0] = cxt5066_init_verbs_vostro;
spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc; spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
spec->mixers[spec->num_mixers++] = cxt5066_mixers; spec->mixers[spec->num_mixers++] = cxt5066_mixers;
@ -3224,7 +3189,7 @@ static int patch_cxt5066(struct hda_codec *codec)
break; break;
case CXT5066_IDEAPAD: case CXT5066_IDEAPAD:
codec->patch_ops.init = cxt5066_init; codec->patch_ops.init = cxt5066_init;
codec->patch_ops.unsol_event = cxt5066_ideapad_event; codec->patch_ops.unsol_event = cxt5066_unsol_event;
spec->mixers[spec->num_mixers++] = cxt5066_mixer_master; spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
spec->mixers[spec->num_mixers++] = cxt5066_mixers; spec->mixers[spec->num_mixers++] = cxt5066_mixers;
spec->init_verbs[0] = cxt5066_init_verbs_ideapad; spec->init_verbs[0] = cxt5066_init_verbs_ideapad;
@ -3240,7 +3205,7 @@ static int patch_cxt5066(struct hda_codec *codec)
break; break;
case CXT5066_THINKPAD: case CXT5066_THINKPAD:
codec->patch_ops.init = cxt5066_init; codec->patch_ops.init = cxt5066_init;
codec->patch_ops.unsol_event = cxt5066_thinkpad_event; codec->patch_ops.unsol_event = cxt5066_unsol_event;
spec->mixers[spec->num_mixers++] = cxt5066_mixer_master; spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
spec->mixers[spec->num_mixers++] = cxt5066_mixers; spec->mixers[spec->num_mixers++] = cxt5066_mixers;
spec->init_verbs[0] = cxt5066_init_verbs_thinkpad; spec->init_verbs[0] = cxt5066_init_verbs_thinkpad;