Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1599705

[PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data

Show all headers | View raw

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>
---
 drivers/watchdog/s3c2410_wdt.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 52b66bcdd1ef..0532dc93e600 100644
--- 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)
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/3] watchdog: s3c2410: Minor cleanups Krzysztof Kozlowski <krzk@kernel.org> - 2017-03-13 20:10 +0100
  [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Krzysztof Kozlowski <krzk@kernel.org> - 2017-03-13 20:10 +0100
    Re: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - 2017-03-14 14:30 +0100
      Re: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Krzysztof Kozlowski <krzk@kernel.org> - 2017-03-14 14:30 +0100
        Re: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Guenter Roeck <linux@roeck-us.net> - 2017-03-14 14:50 +0100
    Re: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Guenter Roeck <linux@roeck-us.net> - 2017-03-14 14:50 +0100

csiph-web