From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: wim@iguana.be, linux-watchdog@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [RESEND PATCH v3 6/6] watchdog: omap_wdt: eliminate goto
Date: Thu, 25 Oct 2012 18:19:12 +0300 [thread overview]
Message-ID: <1351178352-3989-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi>
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
next prev parent reply other threads:[~2012-10-25 15:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 15:19 [RESEND PATCH v3 0/6] watchdog: omap_wdt: convert to new watchdog core Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 1/6] " Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 2/6] watchdog: omap_wdt: convert kzalloc() to devm_kzalloc() Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 3/6] watchdog: omap_wdt: convert request_mem_region() to devm_request_mem_region() Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 4/6] watchdog: omap_wdt: convert ioremap() to devm_ioremap() Aaro Koskinen
2012-10-25 15:19 ` [RESEND PATCH v3 5/6] watchdog: omap_wdt: delete redundant platform_set_drvdata() calls Aaro Koskinen
2012-10-25 15:19 ` Aaro Koskinen [this message]
2012-11-12 18:46 [RESEND PATCH v3 0/6] watchdog: omap_wdt: convert to new watchdog core Aaro Koskinen
2012-11-12 18:47 ` [RESEND PATCH v3 6/6] watchdog: omap_wdt: eliminate goto Aaro Koskinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351178352-3989-7-git-send-email-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).