]> git.hungrycats.org Git - linux/commitdiff
watchdog: mt7621_wdt: Remove assignment of dev pointer
authorGuenter Roeck <linux@roeck-us.net>
Mon, 12 Sep 2016 13:16:51 +0000 (06:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Oct 2016 07:45:26 +0000 (03:45 -0400)
commit 8355b3f94425ac8b9683869354be935795f055ca upstream.

Commit 0254e953537c ("watchdog: Drop pointer to watchdog device from
struct watchdog_device") removed the dev pointer from struct
watchdog_device, but this driver was still assigning it, leading to
a compilation error:

drivers/watchdog/mt7621_wdt.c: In function 'mt7621_wdt_probe':
drivers/watchdog/mt7621_wdt.c:142:16: error:
'struct watchdog_device' has no member named 'dev'

Fix this by removing the assignment.

Fixes: 0254e953537c ("watchdog: Drop pointer to watchdog device ...")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/watchdog/mt7621_wdt.c

index 4a2290f900a87db3c06df2079a8439b1caa7e240..d5735c12067d609465c556e17422e86b08ffe140 100644 (file)
@@ -139,7 +139,6 @@ static int mt7621_wdt_probe(struct platform_device *pdev)
        if (!IS_ERR(mt7621_wdt_reset))
                reset_control_deassert(mt7621_wdt_reset);
 
-       mt7621_wdt_dev.dev = &pdev->dev;
        mt7621_wdt_dev.bootstatus = mt7621_wdt_bootcause();
 
        watchdog_init_timeout(&mt7621_wdt_dev, mt7621_wdt_dev.max_timeout,