From patchwork Thu Jun 16 21:27:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70230 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp465135qgy; Thu, 16 Jun 2016 14:30:39 -0700 (PDT) X-Received: by 10.98.103.198 with SMTP id t67mr7489193pfj.158.1466112639671; Thu, 16 Jun 2016 14:30:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q9si10634634paz.202.2016.06.16.14.30.36; Thu, 16 Jun 2016 14:30:39 -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 S1755403AbcFPV3s (ORCPT + 30 others); Thu, 16 Jun 2016 17:29:48 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35551 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933395AbcFPV3j (ORCPT ); Thu, 16 Jun 2016 17:29:39 -0400 Received: by mail-wm0-f50.google.com with SMTP id v199so207677993wmv.0 for ; Thu, 16 Jun 2016 14:29:38 -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=FpGgJkmIFyOjZ6cRVgvGQpVqRSCH79OxIdzn9CM8O7Y=; b=HTx8ROhE/kw6MSlxGRE14bxfds9FsUgljmUeE0xLv9n6qRdhtqe/GPAEgVBtRJENfF /C/iW7UWU5s/EyyL+wMFRqiZ6eljGL7Enj+1ShdXvzE/VdZjm3WHKj+9pxQ8miPmW+ve H0QqMoechwYhIKcOh+4zBM0Kb3QwRUjHGjLT0= 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=FpGgJkmIFyOjZ6cRVgvGQpVqRSCH79OxIdzn9CM8O7Y=; b=i1YSvYrGTlBY0ZQaVpggoLqPvvhU3iN5+eRP/dCgEyInbAwrZ63X6sY/2j1DvkgIRz 9E7H/ndYECzOTynB6MWm/gHFOYQYbCwKoY46CcmwvQETay6sML8niOYYShaVA9B3jVjF sJewUJ002pLlw3e7NvbHYdXKEGY+lYsJpLpiUaCTXOWkbVqkShQ13Yu5spUKIUv5m5N7 dZfsgWzOUTXMioyDCStw+o6/3OOzWjC55rSb9HBYGGEH5SAPynSkEi/lRepyB23cv7Zy I0Z0TPd5vx558WF2VqrwNeBwGURf/iUROUwZYMfe35fxg9dJXEZua3hPaOh/Vx3ew/E5 iiYg== X-Gm-Message-State: ALyK8tJGBZWDXwijNak52nNNS+u+w/wm50I6MIJDdId6gase+J3/a1HxFs0BcYAdQAgwSWYO X-Received: by 10.28.191.193 with SMTP id o62mr8112280wmi.64.1466112577752; Thu, 16 Jun 2016 14:29:37 -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 x128sm16705606wmf.6.2016.06.16.14.29.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:36 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Neil Armstrong , linux-arm-kernel@lists.infradead.org (moderated list:ARM/OXNAS platfor...) Subject: [PATCH V2 62/63] clocksource/drivers/oxnas-rps: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:21 +0200 Message-Id: <1466112442-31105-63-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> References: <1466112442-31105-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 functions do not return any error. They behave as the following: - panic, thus leading to a kernel crash while another timer may work and make the system boot up correctly or - print an error and let 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/timer-oxnas-rps.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c index c002e99..0d99f40 100644 --- a/drivers/clocksource/timer-oxnas-rps.c +++ b/drivers/clocksource/timer-oxnas-rps.c @@ -220,32 +220,37 @@ static int __init oxnas_rps_clocksource_init(struct oxnas_rps_timer *rps) return 0; } -static void __init oxnas_rps_timer_init(struct device_node *np) +static int __init oxnas_rps_timer_init(struct device_node *np) { struct oxnas_rps_timer *rps; void __iomem *base; int ret; rps = kzalloc(sizeof(*rps), GFP_KERNEL); - if (!rps) { - pr_err("Failed to allocate rps structure\n"); - return; - } + if (!rps) + return -ENOMEM; rps->clk = of_clk_get(np, 0); - if (WARN_ON(IS_ERR(rps->clk))) + if (IS_ERR(rps->clk)) { + ret = PTR_ERR(rps->clk); goto err_alloc; + } - if (WARN_ON(clk_prepare_enable(rps->clk))) + ret = clk_prepare_enable(rps->clk); + if (ret) goto err_clk; base = of_iomap(np, 0); - if (WARN_ON(!base)) + if (!base) { + ret = -ENXIO; goto err_clk_prepare; + } rps->irq = irq_of_parse_and_map(np, 0); - if (WARN_ON(rps->irq < 0)) + if (rps->irq < 0) { + ret = -EINVAL; goto err_iomap; + } rps->clkevt_base = base + TIMER1_REG_OFFSET; rps->clksrc_base = base + TIMER2_REG_OFFSET; @@ -261,7 +266,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np) ret = request_irq(rps->irq, oxnas_rps_timer_irq, IRQF_TIMER | IRQF_IRQPOLL, "rps-timer", rps); - if (WARN_ON(ret)) + if (ret) goto err_iomap; ret = oxnas_rps_clocksource_init(rps); @@ -272,7 +277,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np) if (ret) goto err_irqreq; - return; + return 0; err_irqreq: free_irq(rps->irq, rps); @@ -284,7 +289,9 @@ err_clk: clk_put(rps->clk); err_alloc: kfree(rps); + + return ret; } -CLOCKSOURCE_OF_DECLARE(ox810se_rps, - "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(ox810se_rps, + "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);