From patchwork Fri Jun 17 10:43:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70312 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp210419qgy; Fri, 17 Jun 2016 03:43:31 -0700 (PDT) X-Received: by 10.66.249.234 with SMTP id yx10mr1729671pac.29.1466160210740; Fri, 17 Jun 2016 03:43:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i8si22542125paw.129.2016.06.17.03.43.30; Fri, 17 Jun 2016 03:43:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755495AbcFQKn0 (ORCPT + 30 others); Fri, 17 Jun 2016 06:43:26 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36704 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755166AbcFQKnV (ORCPT ); Fri, 17 Jun 2016 06:43:21 -0400 Received: by mail-wm0-f46.google.com with SMTP id f126so83742274wma.1 for ; Fri, 17 Jun 2016 03:43:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BElfppqY2TMLuSeu9Zl2L1IFinCMwmj4Q1snTxPz17Q=; b=Uq+6ZZRtxfBqfhfJ3BWTs3lDJGn0Z0ajCJBaSGdvKHvlDItN+aIEfVxX+vYi3IGe5c Fsph0hxswDPNuEEAySfLG3ND83L24lEYvg5nEewexG7f7Jc/C67TUIr2PYCK0/AH3gB0 I5ry42lSld0yMCKBO0Xe4k02tq7NY8rh6t8wI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BElfppqY2TMLuSeu9Zl2L1IFinCMwmj4Q1snTxPz17Q=; b=fsifB2rPNXhz3HsfJ7vcodXNNlIQ0loCRshMBBOhkjh+GpoIiqm622HqGZGv9S2/XN MgNCaS4l2B9VdaTxiMQDZtnOTO0+ZaicnzyOE3y8SYjMaVZtpV0ka4ILjEIFUFYo3cYf nSQXKFlx5ekQ9jxcufDUqh6s4m96zoRhKHs9bZalzMnBvc6Ka5iXNsFogv6MNKEiTGPz gMO5HaGy4yleE6k6fEBL6R0TC8evD+ClN1oLS36jLYIWqqbwRmmNkOzhPw6tytnEtrWB QiMnhMsVoXwssnzOVRF5nY7ugcQ6VLFOcxymtrVfJ0PGWLnZeiyO2uwkbrUYBrW3zDTa KNfQ== X-Gm-Message-State: ALyK8tIBBsVZJdYlFqInaeeprxt073KxjMyQmJ+W9aR9ZQNQ9Bv5L/dWEDtz7k3Q3BcoUHC7 X-Received: by 10.194.117.35 with SMTP id kb3mr1731503wjb.136.1466160200466; Fri, 17 Jun 2016 03:43:20 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id x10sm34545184wjj.14.2016.06.17.03.43.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jun 2016 03:43:19 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de, ukl@pengutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V3] clocksource/drivers/mxs: Convert init function to return error Date: Fri, 17 Jun 2016 12:43:10 +0200 Message-Id: <1466160190-25239-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20160617063353.GT26048@pengutronix.de> References: <20160617063353.GT26048@pengutronix.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The init function does not return any error, it prints a message, returns and lets the caller unaware if the state of the system. Change that by converting the init functions to return an error conforming to the CLOCKSOURCE_OF_RET prototype. Proper error handling (rollback, errno value) will be changed later case by case, thus this change just return back an error or success in the init function. Signed-off-by: Daniel Lezcano --- drivers/clocksource/mxs_timer.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index f5ce296..17b9d19 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -226,10 +226,10 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) return 0; } -static void __init mxs_timer_init(struct device_node *np) +static int __init mxs_timer_init(struct device_node *np) { struct clk *timer_clk; - int irq; + int irq, ret; mxs_timrot_base = of_iomap(np, 0); WARN_ON(!mxs_timrot_base); @@ -237,10 +237,12 @@ static void __init mxs_timer_init(struct device_node *np) timer_clk = of_clk_get(np, 0); if (IS_ERR(timer_clk)) { pr_err("%s: failed to get clk\n", __func__); - return; + return PTR_ERR(timer_clk); } - clk_prepare_enable(timer_clk); + ret = clk_prepare_enable(timer_clk); + if (ret) + return ret; /* * Initialize timers to a known state @@ -278,11 +280,19 @@ static void __init mxs_timer_init(struct device_node *np) mxs_timrot_base + HW_TIMROT_FIXED_COUNTn(1)); /* init and register the timer to the framework */ - mxs_clocksource_init(timer_clk); - mxs_clockevent_init(timer_clk); + ret = mxs_clocksource_init(timer_clk); + if (ret) + return ret; + + ret = mxs_clockevent_init(timer_clk); + if (ret) + return ret; /* Make irqs happen */ irq = irq_of_parse_and_map(np, 0); - setup_irq(irq, &mxs_timer_irq); + if (irq <= 0) + return -EINVAL; + + return setup_irq(irq, &mxs_timer_irq); } -CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(mxs, "fsl,timrot", mxs_timer_init);