Commit 18fe73ef authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Drop unused fields from struct hda_codec_preset

It's very unlikely that we'd need these fields out of sudden.
Let's drop them.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent cd6a6503
...@@ -27,15 +27,7 @@ static int hda_codec_match(struct hdac_device *dev, struct hdac_driver *drv) ...@@ -27,15 +27,7 @@ static int hda_codec_match(struct hdac_device *dev, struct hdac_driver *drv)
u32 id = codec->probe_id ? codec->probe_id : codec->core.vendor_id; u32 id = codec->probe_id ? codec->probe_id : codec->core.vendor_id;
for (preset = driver->preset; preset->id; preset++) { for (preset = driver->preset; preset->id; preset++) {
u32 mask = preset->mask; if (preset->id == id &&
if (preset->afg && preset->afg != codec->core.afg)
continue;
if (preset->mfg && preset->mfg != codec->core.mfg)
continue;
if (!mask)
mask = ~0;
if (preset->id == (id & mask) &&
(!preset->rev || preset->rev == codec->core.revision_id)) { (!preset->rev || preset->rev == codec->core.revision_id)) {
codec->preset = preset; codec->preset = preset;
return 1; return 1;
......
...@@ -82,11 +82,7 @@ struct hda_bus { ...@@ -82,11 +82,7 @@ struct hda_bus {
*/ */
struct hda_codec_preset { struct hda_codec_preset {
unsigned int id; unsigned int id;
unsigned int mask;
unsigned int subs;
unsigned int subs_mask;
unsigned int rev; unsigned int rev;
hda_nid_t afg, mfg;
const char *name; const char *name;
int (*patch)(struct hda_codec *codec); int (*patch)(struct hda_codec *codec);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment