watchdog: s3c2410: Simplify getting driver data

Simplify the flow in helper function for getting the driver data by
using of_device_get_match_data() and only one if() branch.

The code should be equivalent.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 52b66bcdd1ef168089df98a7dc2af94dc8dfb106..0532dc93e6000ed01607c22d60ceb2a09f993f12 100644 (file)
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
@@ -510,14 +511,16 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)
 static inline const struct s3c2410_wdt_variant *
 s3c2410_get_wdt_drv_data(struct platform_device *pdev)
 {
-       if (pdev->dev.of_node) {
-               const struct of_device_id *match;
-               match = of_match_node(s3c2410_wdt_match, pdev->dev.of_node);
-               return (struct s3c2410_wdt_variant *)match->data;
-       } else {
-               return (struct s3c2410_wdt_variant *)
-                       platform_get_device_id(pdev)->driver_data;
+       const struct s3c2410_wdt_variant *variant;
+
+       variant = of_device_get_match_data(&pdev->dev);
+       if (!variant) {
+               /* Device matched by platform_device_id */
+               variant = (struct s3c2410_wdt_variant *)
+                          platform_get_device_id(pdev)->driver_data;
        }
+
+       return variant;
 }
 
 static int s3c2410wdt_probe(struct platform_device *pdev)