Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751548AbdF1HjS (ORCPT ); Wed, 28 Jun 2017 03:39:18 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35777 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751048AbdF1HjH (ORCPT ); Wed, 28 Jun 2017 03:39:07 -0400 From: Arvind Yadav To: linus.walleij@linaro.org, daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] clocksource: timer-u300: Unmap region and unprepare clk obtained by of_iomap/clk_prepare_enable. Date: Wed, 28 Jun 2017 13:08:16 +0530 Message-Id: <4f413218d177cde9760f222329fde91b56797843.1498635400.git.arvind.yadav.cs@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1937 Lines: 71 In case of error at init time, rollback iomapping and unprepare clk. Signed-off-by: Arvind Yadav --- drivers/clocksource/timer-u300.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index 704e40c..e3b29ae 100644 --- a/drivers/clocksource/timer-u300.c +++ b/drivers/clocksource/timer-u300.c @@ -376,19 +376,22 @@ static int __init u300_timer_init_of(struct device_node *np) irq = irq_of_parse_and_map(np, 2); if (!irq) { pr_err("no IRQ for system timer\n"); - return -EINVAL; + ret = -EINVAL; + goto err_iounmap; } pr_info("U300 GP1 timer @ base: %p, IRQ: %u\n", u300_timer_base, irq); /* Clock the interrupt controller */ clk = of_clk_get(np, 0); - if (IS_ERR(clk)) - return PTR_ERR(clk); + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); + goto err_iounmap; + } ret = clk_prepare_enable(clk); if (ret) - return ret; + goto err_iounmap; rate = clk_get_rate(clk); @@ -422,7 +425,7 @@ static int __init u300_timer_init_of(struct device_node *np) /* Set up the IRQ handler */ ret = setup_irq(irq, &u300_timer_irq); if (ret) - return ret; + goto err_unprepare; /* Reset the General Purpose timer 2 */ writel(U300_TIMER_APP_RGPT2_TIMER_RESET, @@ -444,7 +447,7 @@ static int __init u300_timer_init_of(struct device_node *np) "GPT2", rate, 300, 32, clocksource_mmio_readl_up); if (ret) { pr_err("timer: failed to initialize U300 clock source\n"); - return ret; + goto err_unprepare; } /* Configure and register the clockevent */ @@ -456,6 +459,12 @@ static int __init u300_timer_init_of(struct device_node *np) * used by hrtimers! */ return 0; + +err_unprepare: + clk_disable_unprepare(clk); +err_iounmap: + iounmap(u300_timer_base); + return ret; } CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", -- 1.9.1