From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Sun, 16 Sep 2018 23:45:42 +0000 (-0700)
Subject: slimbus: core: match device tree based devices correctly
X-Git-Tag: v5.4-rc1~2359^2~117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14a649d33e8145ec14e0429e56bbb12660baa4df;p=platform%2Fkernel%2Flinux-rpi.git

slimbus: core: match device tree based devices correctly

device_id for device tree based devices come from dt compatible string,
such drivers need not provide non dt style device id table.

Match those device using compatible strings.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c
index 95b00d2..7cd635e 100644
--- a/drivers/slimbus/core.c
+++ b/drivers/slimbus/core.c
@@ -32,6 +32,10 @@ static int slim_device_match(struct device *dev, struct device_driver *drv)
 	struct slim_device *sbdev = to_slim_device(dev);
 	struct slim_driver *sbdrv = to_slim_driver(drv);
 
+	/* Attempt an OF style match first */
+	if (of_driver_match_device(dev, drv))
+		return 1;
+
 	return !!slim_match(sbdrv->id_table, sbdev);
 }
 
@@ -77,7 +81,7 @@ EXPORT_SYMBOL_GPL(slimbus_bus);
 int __slim_driver_register(struct slim_driver *drv, struct module *owner)
 {
 	/* ID table and probe are mandatory */
-	if (!drv->id_table || !drv->probe)
+	if (!(drv->driver.of_match_table || drv->id_table) || !drv->probe)
 		return -EINVAL;
 
 	drv->driver.bus = &slimbus_bus;