Merge tag 'sound-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[~andy/linux] / drivers / watchdog / da9052_wdt.c

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index 367445009c64b98e5361eda0082f01f9db4dd707..f09c54e9686fad94104a7679aa7a7675d32d3ebd 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);