Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus

[cascardo/linux.git] / drivers / watchdog / da9052_wdt.c

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index 3674450..f09c54e 100644 (file)
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -215,14 +215,14 @@ static int da9052_wdt_probe(struct platform_device *pdev)
                goto err;
        }
 
-       dev_set_drvdata(&pdev->dev, driver_data);
+       platform_set_drvdata(pdev, driver_data);
 err:
        return ret;
 }
 
 static int da9052_wdt_remove(struct platform_device *pdev)
 {
-       struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);
+       struct da9052_wdt_data *driver_data = platform_get_drvdata(pdev);
 
        watchdog_unregister_device(&driver_data->wdt);
        kref_put(&driver_data->kref, da9052_wdt_release_resources);