From patchwork Thu Jun 16 21:26:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70264 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp468594qgy; Thu, 16 Jun 2016 14:40:53 -0700 (PDT) X-Received: by 10.98.14.140 with SMTP id 12mr7611683pfo.68.1466113253013; Thu, 16 Jun 2016 14:40:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h62si8001248pfb.176.2016.06.16.14.40.52; Thu, 16 Jun 2016 14:40: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 S1755266AbcFPVkg (ORCPT + 30 others); Thu, 16 Jun 2016 17:40:36 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36876 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754191AbcFPV2d (ORCPT ); Thu, 16 Jun 2016 17:28:33 -0400 Received: by mail-wm0-f50.google.com with SMTP id a66so75542481wme.0 for ; Thu, 16 Jun 2016 14:28: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=feP+Ioz4hUAWac2Q/VKG9fE2IuSKQGY40BCy0UibR+s=; b=N9ylLIqR2eyNIgjU3hUJdYhjhdk90dBNpySk1l0tc89rf4cOfy8ehjBEVL0zdlsFcZ ayZArUbnrVOOPDwFy/QTu3732i9DXlWuhfyW/geJs6G7MjFTGt40OA3chhblCYkKPtie te8lUTOFf4ElsHJ30GlBeZrZfQDjk6Vw7URjI= 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=feP+Ioz4hUAWac2Q/VKG9fE2IuSKQGY40BCy0UibR+s=; b=PfSaDzGBHlJXj7AHudwfaN3uW65YV1kfcN2hPn447E2qQIbZuDIOflUFmL0L311BVj DsIpdj/6CyinJ1NocZpS/nKQbcATWpDCppqCOlaqS7v1VyF9Neo6zXjjKU4llWgomASG jP8VYvtEI+13jaIymX5xMagmD9ycd+JpHWwgFq+Gc6MH+18sUgcuyGthC0erEwEHdGmD Cybfy4LDbqcYcyV/8wARXN1fJU92EQGeOIG78+UBj0ihmfPLu7WY0vCU95e8mT+ql8zG 9NvbyLP4NtLtpJWLL7OXJiuXio8ddOu9BwndeC2OGerphwS1MnjA3csT0fw5lFy3/xNR thSw== X-Gm-Message-State: ALyK8tLyGxHXx+eagEBeP+1j5kjwYA6fdS36UJPcZkOSU6a63mcCcYwKYi2ztSfni/2Lip+h X-Received: by 10.28.15.197 with SMTP id 188mr18074727wmp.75.1466112512495; Thu, 16 Jun 2016 14:28:32 -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.28.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:31 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 23/63] clocksource/drivers/moxart_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:42 +0200 Message-Id: <1466112442-31105-24-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/mips-gic-timer.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index 89d3e4d..b164b87 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -146,7 +146,7 @@ static struct clocksource gic_clocksource = { .archdata = { .vdso_clock_mode = VDSO_CLOCK_GIC }, }; -static void __init __gic_clocksource_init(void) +static int __init __gic_clocksource_init(void) { int ret; @@ -159,6 +159,8 @@ static void __init __gic_clocksource_init(void) ret = clocksource_register_hz(&gic_clocksource, gic_frequency); if (ret < 0) pr_warn("GIC: Unable to register clocksource\n"); + + return ret; } void __init gic_clocksource_init(unsigned int frequency) @@ -179,31 +181,35 @@ static void __init gic_clocksource_of_init(struct device_node *node) struct clk *clk; int ret; - if (WARN_ON(!gic_present || !node->parent || - !of_device_is_compatible(node->parent, "mti,gic"))) - return; + if (!gic_present || !node->parent || + !of_device_is_compatible(node->parent, "mti,gic")) { + pr_warn("No DT definition for the mips gic driver"); + return -ENXIO; + } clk = of_clk_get(node, 0); if (!IS_ERR(clk)) { if (clk_prepare_enable(clk) < 0) { pr_err("GIC failed to enable clock\n"); clk_put(clk); - return; + return PTR_ERR(clk); } gic_frequency = clk_get_rate(clk); } else if (of_property_read_u32(node, "clock-frequency", &gic_frequency)) { pr_err("GIC frequency not specified.\n"); - return; + return -EINVAL;; } gic_timer_irq = irq_of_parse_and_map(node, 0); if (!gic_timer_irq) { pr_err("GIC timer IRQ not specified.\n"); - return; + return -EINVAL;; } - __gic_clocksource_init(); + ret = __gic_clocksource_init(); + if (ret) + return ret; ret = gic_clockevent_init(); if (!ret && !IS_ERR(clk)) { @@ -213,6 +219,8 @@ static void __init gic_clocksource_of_init(struct device_node *node) /* And finally start the counter */ gic_start_count(); + + return 0; } -CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer", +CLOCKSOURCE_OF_DECLARE_RET(mips_gic_timer, "mti,gic-timer", gic_clocksource_of_init);