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

Commit f0ded83b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wim Van Sebroeck
Browse files

watchdog: mpc8xxx: make use of of_device_get_match_data 



This function is new in v4.2-rc1 and makes a forward declaration of the
match table superfluous which can so be removed.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 50ffb53e

drivers/watchdog/mpc8xxx_wdt.c

+2 −4
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static struct watchdog_device mpc8xxx_wdt_dev = { 
	.ops = &mpc8xxx_wdt_ops,

};



static const struct of_device_id mpc8xxx_wdt_match[];

static int mpc8xxx_wdt_probe(struct platform_device *ofdev)

{

	int ret;
@@ -150,10 +149,9 @@ static int mpc8xxx_wdt_probe(struct platform_device *ofdev) 
	bool enabled;

	unsigned int timeout_sec;



	match = of_match_device(mpc8xxx_wdt_match, &ofdev->dev);

	if (!match)

	wdt_type = of_device_get_match_data(&ofdev->dev);

	if (!wdt_type)

		return -EINVAL;

	wdt_type = match->data;



	if (!freq || freq == -1)

		return -EINVAL;