Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946296Ab2JYPUA (ORCPT ); Thu, 25 Oct 2012 11:20:00 -0400 Received: from filtteri2.pp.htv.fi ([213.243.153.185]:37244 "EHLO filtteri2.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946214Ab2JYPTf (ORCPT ); Thu, 25 Oct 2012 11:19:35 -0400 From: Aaro Koskinen To: wim@iguana.be, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Cc: Aaro Koskinen Subject: [RESEND PATCH v3 6/6] watchdog: omap_wdt: eliminate goto Date: Thu, 25 Oct 2012 18:19:12 +0300 Message-Id: <1351178352-3989-7-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi> References: <1351178352-3989-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1268 Lines: 44 Eliminate a goto to simplify the code. Signed-off-by: Aaro Koskinen --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/