watchdog: simplify getting .drvdata

We should get drvdata from struct device directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
index 3ec1f418837d1af8f3e0eb325e7198ce7ae39939..c3924356d1731153847b82147b58f70f76a5a382 100644 (file)
--- a/drivers/watchdog/cadence_wdt.c
+++ b/drivers/watchdog/cadence_wdt.c
@@ -418,8 +418,7 @@ static void cdns_wdt_shutdown(struct platform_device *pdev)
  */
 static int __maybe_unused cdns_wdt_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct cdns_wdt *wdt = platform_get_drvdata(pdev);
+       struct cdns_wdt *wdt = dev_get_drvdata(dev);
 
        if (watchdog_active(&wdt->cdns_wdt_device)) {
                cdns_wdt_stop(&wdt->cdns_wdt_device);
@@ -438,8 +437,7 @@ static int __maybe_unused cdns_wdt_suspend(struct device *dev)
 static int __maybe_unused cdns_wdt_resume(struct device *dev)
 {
        int ret;
-       struct platform_device *pdev = to_platform_device(dev);
-       struct cdns_wdt *wdt = platform_get_drvdata(pdev);
+       struct cdns_wdt *wdt = dev_get_drvdata(dev);
 
        if (watchdog_active(&wdt->cdns_wdt_device)) {
                ret = clk_prepare_enable(wdt->clk);

diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 4acbe05e27bb809923dcab3512753624ad6c6c6c..d3f7eb0466782f4b386895cf509c54213a31819d 100644 (file)
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -268,8 +268,7 @@ static int xwdt_remove(struct platform_device *pdev)
  */
 static int __maybe_unused xwdt_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct xwdt_device *xdev = platform_get_drvdata(pdev);
+       struct xwdt_device *xdev = dev_get_drvdata(dev);
 
        if (watchdog_active(&xdev->xilinx_wdt_wdd))
                xilinx_wdt_stop(&xdev->xilinx_wdt_wdd);
@@ -285,8 +284,7 @@ static int __maybe_unused xwdt_suspend(struct device *dev)
  */
 static int __maybe_unused xwdt_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct xwdt_device *xdev = platform_get_drvdata(pdev);
+       struct xwdt_device *xdev = dev_get_drvdata(dev);
        int ret = 0;
 
        if (watchdog_active(&xdev->xilinx_wdt_wdd))

diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index 0da9943d405f8ff89efc87a0cf6df5ff43df9d6f..56ad19608a9bed0ae43ffaa87e59c71ee85d104e 100644 (file)
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -447,8 +447,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int wdat_wdt_suspend_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wdat_wdt *wdat = platform_get_drvdata(pdev);
+       struct wdat_wdt *wdat = dev_get_drvdata(dev);
        int ret;
 
        if (!watchdog_active(&wdat->wdd))
@@ -475,8 +474,7 @@ static int wdat_wdt_suspend_noirq(struct device *dev)
 
 static int wdat_wdt_resume_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wdat_wdt *wdat = platform_get_drvdata(pdev);
+       struct wdat_wdt *wdat = dev_get_drvdata(dev);
        int ret;
 
        if (!watchdog_active(&wdat->wdd))