From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Fri, 3 May 2013 20:11:14 +0000 (+0530)
Subject: watchdog: at32ap700x: Remove redundant platform_set_drvdata()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=321e31231d781aa91e94e8e3974db1edb428b6a4;p=openwrt%2Fstaging%2Fblogic.git

watchdog: at32ap700x: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index c4cb5526112a..b178e717ef09 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -365,7 +365,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
 	ret = misc_register(&wdt->miscdev);
 	if (ret) {
 		dev_dbg(&pdev->dev, "failed to register wdt miscdev\n");
-		goto err_register;
+		goto err_free;
 	}
 
 	dev_info(&pdev->dev,
@@ -374,8 +374,6 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
 
 	return 0;
 
-err_register:
-	platform_set_drvdata(pdev, NULL);
 err_free:
 	wdt = NULL;
 	return ret;
@@ -390,7 +388,6 @@ static int __exit at32_wdt_remove(struct platform_device *pdev)
 
 		misc_deregister(&wdt->miscdev);
 		wdt = NULL;
-		platform_set_drvdata(pdev, NULL);
 	}
 	return 0;
 }