From patchwork Thu Jul 7 08:01:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71556 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1280747qgy; Thu, 7 Jul 2016 01:27:53 -0700 (PDT) X-Received: by 10.66.189.104 with SMTP id gh8mr7104187pac.125.1467880073470; Thu, 07 Jul 2016 01:27:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q7si3089045pfb.208.2016.07.07.01.27.53; Thu, 07 Jul 2016 01:27:53 -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 S933638AbcGGI1v (ORCPT + 30 others); Thu, 7 Jul 2016 04:27:51 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38890 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933436AbcGGIDd (ORCPT ); Thu, 7 Jul 2016 04:03:33 -0400 Received: by mail-wm0-f42.google.com with SMTP id n127so5806607wme.1 for ; Thu, 07 Jul 2016 01:03:33 -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=GJSGIfUjtM5QZOu9kQ1gGFGsFobfvOXEEdbfFalbMx6ogwSPNGeqlVfuhwLFNRzhAy rA7RVxChjIoRcT+j0cC/w9dKzVe0yOV+r3f1o90Bd7syAF+domdFpflVbYsUN6cqehJ2 nAxNzVoEHyX6tpsKg3ElRhSA7KZ/u/MJR7BNs= 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=ThZV9RFU/RO/XyRypjjbO52Rbhbw/19b7CLkHQ0OSyBSvQpYQL8CY8k/uGHprUojPq qqz49MI772VjVdv9sn3B4CaZlD+p8YkIRqBud809jhGjASI0kopG/1POn/q8VbdNCS1d /kI1fKMZNyBu6xbfkckmeVDbHWoGYl3q0wzioidBe/WJ5+GDCukZEAna4wc/Ze+WYbX1 5BqtycB49ZazVmLjXUY6r19CsH5VKfQknAEz2bfhbHboY6MniweD6bvNTmNxaHH/rzQE pzEpHXtqHXV1bqvAyvxG2QBlz+n8csNBF9evb14rwncpTz0GKc8rd1H4Z36KcHscKVE+ 4jIA== X-Gm-Message-State: ALyK8tLhXFizTWeqC7vLxsiul7TxKpPxIHGZMQqYyYNt/c83gVdygqvFzqI3lwoq48WRuQl6 X-Received: by 10.28.215.139 with SMTP id o133mr1365318wmg.74.1467878606499; Thu, 07 Jul 2016 01:03:26 -0700 (PDT) Received: from localhost.localdomain (lft31-1-88-121-166-205.fbx.proxad.net. [88.121.166.205]) by smtp.gmail.com with ESMTPSA id v70sm51327wmf.18.2016.07.07.01.03.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:26 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 36/93] clocksource/drivers/mxs: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:09 +0200 Message-Id: <1467878526-1238-36-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> References: <577E0BED.3020608@linaro.org> <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> 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);