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: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c
index 00aa31c5f08e3b84ac75100b4ee6941312ae3092..d5ac25cc7fee1fbc87b577da634f9f13706091a5 100644 (file)
--- a/sound/pci/hda/hda_bind.c
+++ b/sound/pci/hda/hda_bind.c
@@ -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;
 
        for (preset = driver->preset; preset->id; preset++) {
-               u32 mask = preset->mask;
-
-               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) &&
+               if (preset->id == id &&
                    (!preset->rev || preset->rev == codec->core.revision_id)) {
                        codec->preset = preset;
                        return 1;

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index ed7e9cfd699a6ee744990c12ca1ce6f420aa510c..6c572588f7e508fb7959ceac9864b13554aa78cb 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -82,11 +82,7 @@ struct hda_bus {
  */
 struct hda_codec_preset {
        unsigned int id;
-       unsigned int mask;
-       unsigned int subs;
-       unsigned int subs_mask;
        unsigned int rev;
-       hda_nid_t afg, mfg;
        const char *name;
        int (*patch)(struct hda_codec *codec);
 };