From patchwork Thu Jul 7 08:01:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71560 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1282040qgy; Thu, 7 Jul 2016 01:31:34 -0700 (PDT) X-Received: by 10.98.13.81 with SMTP id v78mr3229140pfi.91.1467880294625; Thu, 07 Jul 2016 01:31:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ga3si3035709pab.32.2016.07.07.01.31.34; Thu, 07 Jul 2016 01:31:34 -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 S1030384AbcGGIbK (ORCPT + 30 others); Thu, 7 Jul 2016 04:31:10 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36694 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933388AbcGGIDX (ORCPT ); Thu, 7 Jul 2016 04:03:23 -0400 Received: by mail-wm0-f51.google.com with SMTP id f126so200125967wma.1 for ; Thu, 07 Jul 2016 01:03:22 -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=M87uQdkBqAsGXvdJrKGsghekAzL0iIPp6v+8GBQBRHLnM7fr/7dnAKnfEgrsycqx5Q TcLi0RWqHJkeG0ahr+2qCIzDVVDxwcLF783jJq+ns7DT7IqlJ4xAmTBxsm0rAFoM+tYQ QbfUtv9+073ntOVYd14WmtGU1S5r1H25nplFw= 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=Da9MMBurROY/ylYkmcEGnS4yQY6OdbEvEL2F+MRBx1snHXzbulQNVK5JZ/8P5A5GaJ 4FdZmNkbJIvW3Ida2LXgHxJultJ+O7z2TfASFjHK4UFXX8mLxrsaGntEO/G/wIH2azjd tzxUgXdu/agySrPWRlFXFWrbuMxZO7p5G4KH3SLe9EPYU6wHTDvW9APODbwHMkzAGfzh wYzhwMYnAyVWwk39r5JJzofZnosfkJmqckQtcvQ/SK4/WrBs+mu2Zt9Tzcopc5fjkakv YeYtXP4BOxJreo1sujehpYf9AZQEk6JzLuOrD+NFMAM/11Dqs4Jb4ieQP/yvx3pa0Fei VIyw== X-Gm-Message-State: ALyK8tIy3LBvc//Ipt8YSowZUhljDn44btk9RPRe0k8NSh7KQ/Ez9Y+wEkgTHRQa179tGmnP X-Received: by 10.194.22.169 with SMTP id e9mr24450546wjf.128.1467878601133; Thu, 07 Jul 2016 01:03:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:20 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 33/93] clocksource/drivers/mips-gic-timer: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:06 +0200 Message-Id: <1467878526-1238-33-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/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);