Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / wm831x_wdt.c

diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index 3348ddd618c7755bb852186403167df22064a307..d4e47eda41828ea4591a019bde479173e8a4c49a 100644 (file)
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -282,7 +282,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
                goto err;
        }
 
-       dev_set_drvdata(&pdev->dev, driver_data);
+       platform_set_drvdata(pdev, driver_data);
 
        return 0;
 
@@ -292,7 +292,7 @@ err:
 
 static int wm831x_wdt_remove(struct platform_device *pdev)
 {
-       struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
+       struct wm831x_wdt_drvdata *driver_data = platform_get_drvdata(pdev);
 
        watchdog_unregister_device(&driver_data->wdt);