diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-26 15:05:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-26 15:05:39 +0200 |
| commit | 31d44b57c508971c083ce038d7c5ededd09cea01 (patch) | |
| tree | 249689625896d65894f56763c22f726e39fde5ec /sound/pci/hda/hda_codec.c | |
| parent | ALSA: hda - Enable sync_write for AMD chipset with IDT 92HD8x codecs (diff) | |
| parent | ALSA: hda - Fix unused warnings when !SND_HDA_NEEDS_RESUME (diff) | |
| download | linux-31d44b57c508971c083ce038d7c5ededd09cea01.tar.xz linux-31d44b57c508971c083ce038d7c5ededd09cea01.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 2b6019390489..fb07def1586f 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1000,6 +1000,7 @@ void snd_hda_shutup_pins(struct hda_codec *codec) } EXPORT_SYMBOL_HDA(snd_hda_shutup_pins); +#ifdef SND_HDA_NEEDS_RESUME /* Restore the pin controls cleared previously via snd_hda_shutup_pins() */ static void restore_shutup_pins(struct hda_codec *codec) { @@ -1016,6 +1017,7 @@ static void restore_shutup_pins(struct hda_codec *codec) } codec->pins_shutup = 0; } +#endif static void init_hda_cache(struct hda_cache_rec *cache, unsigned int record_size); @@ -1394,6 +1396,7 @@ static void purify_inactive_streams(struct hda_codec *codec) } } +#ifdef SND_HDA_NEEDS_RESUME /* clean up all streams; called from suspend */ static void hda_cleanup_all_streams(struct hda_codec *codec) { @@ -1405,6 +1408,7 @@ static void hda_cleanup_all_streams(struct hda_codec *codec) really_cleanup_stream(codec, p); } } +#endif /* * amp access functions |