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

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
...@@ -139,7 +139,6 @@ static struct watchdog_device mpc8xxx_wdt_dev = { ...@@ -139,7 +139,6 @@ static struct watchdog_device mpc8xxx_wdt_dev = {
.ops = &mpc8xxx_wdt_ops, .ops = &mpc8xxx_wdt_ops,
}; };
static const struct of_device_id mpc8xxx_wdt_match[];
static int mpc8xxx_wdt_probe(struct platform_device *ofdev) static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
{ {
int ret; int ret;
...@@ -150,10 +149,9 @@ static int mpc8xxx_wdt_probe(struct platform_device *ofdev) ...@@ -150,10 +149,9 @@ static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
bool enabled; bool enabled;
unsigned int timeout_sec; unsigned int timeout_sec;
match = of_match_device(mpc8xxx_wdt_match, &ofdev->dev); wdt_type = of_device_get_match_data(&ofdev->dev);
if (!match) if (!wdt_type)
return -EINVAL; return -EINVAL;
wdt_type = match->data;
if (!freq || freq == -1) if (!freq || freq == -1)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment