From patchwork Thu Jul 7 08:01: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: 71549 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1278936qgy; Thu, 7 Jul 2016 01:22:11 -0700 (PDT) X-Received: by 10.66.120.138 with SMTP id lc10mr49787894pab.33.1467879731047; Thu, 07 Jul 2016 01:22:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h124si2893405pfe.212.2016.07.07.01.22.10; Thu, 07 Jul 2016 01:22:11 -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 S1756274AbcGGIEE (ORCPT + 30 others); Thu, 7 Jul 2016 04:04:04 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38053 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933576AbcGGIDt (ORCPT ); Thu, 7 Jul 2016 04:03:49 -0400 Received: by mail-wm0-f45.google.com with SMTP id n127so5814718wme.1 for ; Thu, 07 Jul 2016 01:03:49 -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=/cybx4wub3wqDU+Rnrn5cJMxnazLhs/1b0m5LZUP2a0=; b=Xd3IFyWiO6HHkErwRu66zcAEyvpeZDAQv+HYIYnARpA6WjbCCTl7GdM2fHvQeKOZ0j RjfyjcJhMblsp05ZeNM5/3Af97P2U4NhdPzdEn25QARPlSyCXtkaSCWfxm7pH2YpDnkA FdLSNLbxOIcS+YEG5ibDQ5pD7gXBV5wFDUL0Y= 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=/cybx4wub3wqDU+Rnrn5cJMxnazLhs/1b0m5LZUP2a0=; b=STTxyDlT/w+VQb34IeKI93F7IvSZbFsDclw9+o559uSncPp3nJ8UIMvSFN1cw4CAao Yten2WsP915haNyNGGgf7XoGUJgIUeMboXhwnEKvsFhyF40ktdpWLpVtOA+PCCpVxhfz Z8mM8AGckmWnBGLr7eBVIaWUiZ1NoG47iSrNB5BaDq4n20+//y1xl1287/FQFV9oQm1Y Ae4uIT161PQJepfPKLHFBGzyYMB0eIP2kHIDOI/NxKWJMP6rgxsRIbVg7SQFbcwigynA WTAeerBmjj1JoM+8M0QLBGLFV5W/Fsy9MClN/yLBAZ4NMjjVXTIJ189Y7w2HWP74E8XA NlZw== X-Gm-Message-State: ALyK8tJkxo5Jk9Q9fbcdyRT26G0kCxTgg8uqRU5Gd15OZZbSUIv4y75NAMvTmTrIgrjxTdka X-Received: by 10.194.80.70 with SMTP id p6mr24148964wjx.45.1467878623230; Thu, 07 Jul 2016 01:03:43 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:42 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 48/93] clocksource/drivers/pistachio: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:21 +0200 Message-Id: <1467878526-1238-48-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 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/time-pistachio.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/time-pistachio.c b/drivers/clocksource/time-pistachio.c index 376e59b..adaaec5 100644 --- a/drivers/clocksource/time-pistachio.c +++ b/drivers/clocksource/time-pistachio.c @@ -148,7 +148,7 @@ static struct pistachio_clocksource pcs_gpt = { }, }; -static void __init pistachio_clksrc_of_init(struct device_node *node) +static int __init pistachio_clksrc_of_init(struct device_node *node) { struct clk *sys_clk, *fast_clk; struct regmap *periph_regs; @@ -158,45 +158,45 @@ static void __init pistachio_clksrc_of_init(struct device_node *node) pcs_gpt.base = of_iomap(node, 0); if (!pcs_gpt.base) { pr_err("cannot iomap\n"); - return; + return -ENXIO; } periph_regs = syscon_regmap_lookup_by_phandle(node, "img,cr-periph"); if (IS_ERR(periph_regs)) { pr_err("cannot get peripheral regmap (%ld)\n", PTR_ERR(periph_regs)); - return; + return PTR_ERR(periph_regs); } /* Switch to using the fast counter clock */ ret = regmap_update_bits(periph_regs, PERIP_TIMER_CONTROL, 0xf, 0x0); if (ret) - return; + return ret; sys_clk = of_clk_get_by_name(node, "sys"); if (IS_ERR(sys_clk)) { pr_err("clock get failed (%ld)\n", PTR_ERR(sys_clk)); - return; + return PTR_ERR(sys_clk); } fast_clk = of_clk_get_by_name(node, "fast"); if (IS_ERR(fast_clk)) { pr_err("clock get failed (%lu)\n", PTR_ERR(fast_clk)); - return; + return PTR_ERR(fast_clk); } ret = clk_prepare_enable(sys_clk); if (ret < 0) { pr_err("failed to enable clock (%d)\n", ret); - return; + return ret; } ret = clk_prepare_enable(fast_clk); if (ret < 0) { pr_err("failed to enable clock (%d)\n", ret); clk_disable_unprepare(sys_clk); - return; + return ret; } rate = clk_get_rate(fast_clk); @@ -212,7 +212,7 @@ static void __init pistachio_clksrc_of_init(struct device_node *node) raw_spin_lock_init(&pcs_gpt.lock); sched_clock_register(pistachio_read_sched_clock, 32, rate); - clocksource_register_hz(&pcs_gpt.cs, rate); + return clocksource_register_hz(&pcs_gpt.cs, rate); } -CLOCKSOURCE_OF_DECLARE(pistachio_gptimer, "img,pistachio-gptimer", +CLOCKSOURCE_OF_DECLARE_RET(pistachio_gptimer, "img,pistachio-gptimer", pistachio_clksrc_of_init);