summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/tegra_wdt.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index 1a73e36dc6cf..1763af7b0b21 100644
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -69,7 +69,7 @@ struct tegra_wdt {
bool enabled;
};
-static struct tegra_wdt *tegra_wdt_dev;
+static struct platform_device *tegra_wdt_dev;
static void tegra_wdt_enable(struct tegra_wdt *wdt)
{
@@ -112,8 +112,7 @@ static int tegra_wdt_notify(struct notifier_block *this,
static int tegra_wdt_open(struct inode *inode, struct file *file)
{
- struct miscdevice *miscdev = file->private_data;
- struct tegra_wdt *wdt = dev_get_drvdata(miscdev->parent);
+ struct tegra_wdt *wdt = platform_get_drvdata(tegra_wdt_dev);
if (test_and_set_bit(1, &wdt->users))
return -EBUSY;
@@ -281,7 +280,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, wdt);
- tegra_wdt_dev = wdt;
+ tegra_wdt_dev = pdev;
#ifdef CONFIG_TEGRA_WATCHDOG_ENABLE_ON_PROBE
wdt->enabled = true;
wdt->timeout = heartbeat;
@@ -317,7 +316,7 @@ static int tegra_wdt_remove(struct platform_device *pdev)
release_mem_region(wdt->res_src->start, resource_size(wdt->res_src));
release_mem_region(wdt->res_wdt->start, resource_size(wdt->res_wdt));
kfree(wdt);
- tegra_wdt_dev = NULL;
+ platform_set_drvdata(pdev, NULL);
return 0;
}