lkml.org 
[lkml]   [2012]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 6/6] watchdog: omap_wdt: eliminate goto
Date
Eliminate a goto to simplify the code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/watchdog/omap_wdt.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index af1e72e..bee43a9 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -267,8 +267,10 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
__omap_wdt_disable(wdev);

ret = watchdog_register_device(omap_wdt);
- if (ret)
- goto err_misc;
+ if (ret) {
+ pm_runtime_disable(wdev->dev);
+ return ret;
+ }

pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
__raw_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
@@ -277,11 +279,6 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
pm_runtime_put_sync(wdev->dev);

return 0;
-
-err_misc:
- pm_runtime_disable(wdev->dev);
-
- return ret;
}

static void omap_wdt_shutdown(struct platform_device *pdev)
--
1.7.2.5


\
 
 \ /
  Last update: 2012-10-10 22:41    [W:0.046 / U:1.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site