Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a02c46 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Wim Van Sebroeck
Browse files

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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 58415efe

drivers/watchdog/s3c2410_wdt.c

+10 −7
Original line number Diff line number Diff line
@@ -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 *)

	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)