Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Clean up redundant FG checks

Browse Source 
Just refactoring, no functional changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-31 07:54:38 -07:00
parent 08fa20ae20
commit d819387ef7
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/hda/hda_codec.c
View File

@ -1222,7 +1222,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec,
hda_nid_t fg, unsigned int power_state); hda_nid_t fg, unsigned int power_state);
static unsigned int hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, static unsigned int hda_set_power_state(struct hda_codec *codec,
unsigned int power_state); unsigned int power_state);
/** /**
@ -1239,6 +1239,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,
{ {
struct hda_codec *codec; struct hda_codec *codec;
char component[31]; char component[31];
hda_nid_t fg;
int err; int err;
if (snd_BUG_ON(!bus)) if (snd_BUG_ON(!bus))
@ -1315,7 +1316,8 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,
goto error; goto error;
} }
err = read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg); fg = codec->afg ? codec->afg : codec->mfg;
err = read_widget_caps(codec, fg);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "hda_codec: cannot malloc\n"); snd_printk(KERN_ERR "hda_codec: cannot malloc\n");
goto error; goto error;
@ -1325,27 +1327,22 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,
goto error; goto error;
if (!codec->subsystem_id) { if (!codec->subsystem_id) {
hda_nid_t nid = codec->afg ? codec->afg : codec->mfg;
codec->subsystem_id = codec->subsystem_id =
snd_hda_codec_read(codec, nid, 0, snd_hda_codec_read(codec, fg, 0,
AC_VERB_GET_SUBSYSTEM_ID, 0); AC_VERB_GET_SUBSYSTEM_ID, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec, codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec, fg,
codec->afg ? codec->afg : codec->mfg,
AC_PWRST_CLKSTOP); AC_PWRST_CLKSTOP);
if (!codec->d3_stop_clk) if (!codec->d3_stop_clk)
bus->power_keep_link_on = 1; bus->power_keep_link_on = 1;
#endif #endif
codec->epss = snd_hda_codec_get_supported_ps(codec, codec->epss = snd_hda_codec_get_supported_ps(codec, fg,
codec->afg ? codec->afg : codec->mfg,
AC_PWRST_EPSS); AC_PWRST_EPSS);
/* power-up all before initialization */ /* power-up all before initialization */
hda_set_power_state(codec, hda_set_power_state(codec, AC_PWRST_D0);
codec->afg ? codec->afg : codec->mfg,
AC_PWRST_D0);
snd_hda_codec_proc_new(codec); snd_hda_codec_proc_new(codec);
@ -3566,9 +3563,10 @@ static unsigned int hda_sync_power_state(struct hda_codec *codec,
/* /*
* set power state of the codec, and return the power state * set power state of the codec, and return the power state
*/ */
static unsigned int hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, static unsigned int hda_set_power_state(struct hda_codec *codec,
unsigned int power_state) unsigned int power_state)
{ {
hda_nid_t fg = codec->afg ? codec->afg : codec->mfg;
int count; int count;
unsigned int state; unsigned int state;
@ -3621,9 +3619,7 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec)
if (codec->patch_ops.suspend) if (codec->patch_ops.suspend)
codec->patch_ops.suspend(codec); codec->patch_ops.suspend(codec);
hda_cleanup_all_streams(codec); hda_cleanup_all_streams(codec);
state = hda_set_power_state(codec, state = hda_set_power_state(codec, AC_PWRST_D3);
codec->afg ? codec->afg : codec->mfg,
AC_PWRST_D3);
cancel_delayed_work(&codec->power_work); cancel_delayed_work(&codec->power_work);
spin_lock(&codec->power_lock); spin_lock(&codec->power_lock);
snd_hda_update_power_acct(codec); snd_hda_update_power_acct(codec);
@ -3644,9 +3640,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)
* in the resume / power-save sequence * in the resume / power-save sequence
*/ */
hda_keep_power_on(codec); hda_keep_power_on(codec);
hda_set_power_state(codec, hda_set_power_state(codec, AC_PWRST_D0);
codec->afg ? codec->afg : codec->mfg,
AC_PWRST_D0);
restore_pincfgs(codec); /* restore all current pin configs */ restore_pincfgs(codec); /* restore all current pin configs */
restore_shutup_pins(codec); restore_shutup_pins(codec);
hda_exec_init_verbs(codec); hda_exec_init_verbs(codec);