Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / hda / hda_bus_type.c

diff --git a/sound/hda/hda_bus_type.c b/sound/hda/hda_bus_type.c
index 519914a..89c2711 100644 (file)
--- a/sound/hda/hda_bus_type.c
+++ b/sound/hda/hda_bus_type.c
@@ -10,6 +10,40 @@
 MODULE_DESCRIPTION("HD-audio bus");
 MODULE_LICENSE("GPL");
 
+/**
+ * hdac_get_device_id - gets the hdac device id entry
+ * @hdev: HD-audio core device
+ * @drv: HD-audio codec driver
+ *
+ * Compares the hdac device vendor_id and revision_id to the hdac_device
+ * driver id_table and returns the matching device id entry.
+ */
+const struct hda_device_id *
+hdac_get_device_id(struct hdac_device *hdev, struct hdac_driver *drv)
+{
+       if (drv->id_table) {
+               const struct hda_device_id *id  = drv->id_table;
+
+               while (id->vendor_id) {
+                       if (hdev->vendor_id == id->vendor_id &&
+                               (!id->rev_id || id->rev_id == hdev->revision_id))
+                               return id;
+                       id++;
+               }
+       }
+
+       return NULL;
+}
+EXPORT_SYMBOL_GPL(hdac_get_device_id);
+
+static int hdac_codec_match(struct hdac_device *dev, struct hdac_driver *drv)
+{
+       if (hdac_get_device_id(dev, drv))
+               return 1;
+       else
+               return 0;
+}
+
 static int hda_bus_match(struct device *dev, struct device_driver *drv)
 {
        struct hdac_device *hdev = dev_to_hdac_dev(dev);
@@ -17,8 +51,15 @@ static int hda_bus_match(struct device *dev, struct device_driver *drv)
 
        if (hdev->type != hdrv->type)
                return 0;
+
+       /*
+        * if driver provided a match function use that otherwise we will
+        * use hdac_codec_match function
+        */
        if (hdrv->match)
                return hdrv->match(hdev, hdrv);
+       else
+               return hdac_codec_match(hdev, hdrv);
        return 1;
 }