Merge tag 'drm/panel/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into...

[karo-tx-linux.git] / drivers / watchdog / riowd.c

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 13363adc364f4e54515f7c7ff0b70355ecd47887..3dd8ed28adc8e92dad4c58c4a4663887a3492f8b 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -206,7 +206,7 @@ static int riowd_probe(struct platform_device *op)
        pr_info("Hardware watchdog [%i minutes], regs at %p\n",
                riowd_timeout, p->regs);
 
-       dev_set_drvdata(&op->dev, p);
+       platform_set_drvdata(op, p);
        return 0;
 
 out_iounmap:
@@ -219,7 +219,7 @@ out:
 
 static int riowd_remove(struct platform_device *op)
 {
-       struct riowd *p = dev_get_drvdata(&op->dev);
+       struct riowd *p = platform_get_drvdata(op);
 
        misc_deregister(&riowd_miscdev);
        of_iounmap(&op->resource[0], p->regs, 2);