diff options
| author | Takashi Iwai | 2014-02-25 10:38:13 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2014-02-25 12:12:54 +0100 |
| commit | 648a8d276ed10062addd4a4e18aaf9ff84f14543 (patch) | |
| tree | 5f0dcf8587dfb6123b51fe379e8aaf8812368ef2 /sound/pci/hda/hda_codec.h | |
| parent | ALSA: hda - Create own device struct for each codec (diff) | |
| download | kernel-qcow2-linux-648a8d276ed10062addd4a4e18aaf9ff84f14543.tar.gz kernel-qcow2-linux-648a8d276ed10062addd4a4e18aaf9ff84f14543.tar.xz kernel-qcow2-linux-648a8d276ed10062addd4a4e18aaf9ff84f14543.zip | |
ALSA: hda - Add sysfs to codec object, too
We have currently sysfs attributes for each hwdep, but basically these
should belong to the codec itself, per se. Let's add them to the
codec object while keeping them for hwdep as is for compatibility.
While we are at it, split the sysfs-related stuff into a separate
source file, hda_sysfs.c, and keep only the stuff necessary for hwdep
in hda_hwdep.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
| -rw-r--r-- | sound/pci/hda/hda_codec.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 4d9dd2b70f4a..ad5871f3a669 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -333,14 +333,17 @@ struct hda_codec { struct snd_array driver_pins; /* pin configs set by codec parser */ struct snd_array cvt_setups; /* audio convert setups */ -#ifdef CONFIG_SND_HDA_HWDEP +#ifdef CONFIG_SND_HDA_RECONFIG struct mutex user_mutex; - struct snd_hwdep *hwdep; /* assigned hwdep device */ struct snd_array init_verbs; /* additional init verbs */ struct snd_array hints; /* additional hints */ struct snd_array user_pins; /* default pin configs to override */ #endif +#ifdef CONFIG_SND_HDA_HWDEP + struct snd_hwdep *hwdep; /* assigned hwdep device */ +#endif + /* misc flags */ unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each * status change |