From patchwork Tue Jun 28 10:31:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71021 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511285qgy; Tue, 28 Jun 2016 03:38:30 -0700 (PDT) X-Received: by 10.98.38.4 with SMTP id m4mr532849pfm.57.1467110309970; Tue, 28 Jun 2016 03:38:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b8si33067116paz.190.2016.06.28.03.38.29; Tue, 28 Jun 2016 03:38:29 -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 S1753104AbcF1Ki2 (ORCPT + 30 others); Tue, 28 Jun 2016 06:38:28 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35471 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752943AbcF1KeX (ORCPT ); Tue, 28 Jun 2016 06:34:23 -0400 Received: by mail-wm0-f46.google.com with SMTP id v199so133623713wmv.0 for ; Tue, 28 Jun 2016 03:34:17 -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=LmtURC7LihCsYOwqhozgI9bdd9QtX0oGjYmy6wxJaZk=; b=cz7PNQjUjglgm1AREB3Z1v3xYV/6mVZ5HZN3s2PiiBigwHxag3JI99ZtTsWtvYJz5W EmnDLZOVp4qYoENZkinwPVIE/8jxKlS5E8RYqm0hYpCsI5YtSPDFUYSJxg91ar9AOwjB 0DgkbRmdcEubAqvUsI/fBUR1Q5A1NnSFk9Tgg= 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=LmtURC7LihCsYOwqhozgI9bdd9QtX0oGjYmy6wxJaZk=; b=Or1b2Uji6Nh1ZtF42wHy1lq4AyzKtQDvvFQsNwvQDkDBuJY20haWdoHg6UFD4ZJBGv x5hdKdBAk1nlRTS69d5hZAASKNzkgQZW/9JD2eAWX2gB2RUF4LmflmbdsKcdI+wgdnfV vDNhiJNRHVBJe8gqSnW5xRy3y3m0YbIOBRmKNIblB7uZhOjJst3z/b0OGKH+kBbehuRi NSo/h0P1P2hdxyWKTdpEx50EliREGDLq38H+OP4jv4b5AT7QKDqdDKe6rIqZqYs5rHiQ LRjjUQim0u3JsTHxRbTqf59i8K54aHu+/RU3RtyBpH2/SAhYCNtYaOhvNUeSaInFAo8P fXKw== X-Gm-Message-State: ALyK8tL474yTNoU9mn5C0CYFwXR/T15Po+1LrmOJPak4P7RYpvKRFXEPjvT3XgBA8LBtAsRj X-Received: by 10.28.74.20 with SMTP id x20mr16169776wma.14.1467110056839; Tue, 28 Jun 2016 03:34:16 -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 a84sm5377403wma.0.2016.06.28.03.34.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:16 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH 60/92] clocksource/drivers/u300: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:19 +0200 Message-Id: <1467109911-11060-60-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> References: <577251A4.7030508@linaro.org> <1467109911-11060-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 Acked-by: Linus Walleij --- drivers/clocksource/timer-u300.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index 1744b24..a6a0dec 100644 --- a/drivers/clocksource/timer-u300.c +++ b/drivers/clocksource/timer-u300.c @@ -359,27 +359,37 @@ static struct delay_timer u300_delay_timer; /* * This sets up the system timers, clock source and clock event. */ -static void __init u300_timer_init_of(struct device_node *np) +static int __init u300_timer_init_of(struct device_node *np) { unsigned int irq; struct clk *clk; unsigned long rate; + int ret; u300_timer_base = of_iomap(np, 0); - if (!u300_timer_base) - panic("could not ioremap system timer\n"); + if (!u300_timer_base) { + pr_err("could not ioremap system timer\n"); + return -ENXIO; + } /* Get the IRQ for the GP1 timer */ irq = irq_of_parse_and_map(np, 2); - if (!irq) - panic("no IRQ for system timer\n"); + if (!irq) { + pr_err("no IRQ for system timer\n"); + return -EINVAL; + } pr_info("U300 GP1 timer @ base: %p, IRQ: %u\n", u300_timer_base, irq); /* Clock the interrupt controller */ clk = of_clk_get(np, 0); - BUG_ON(IS_ERR(clk)); - clk_prepare_enable(clk); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + ret = clk_prepare_enable(clk); + if (ret) + return ret; + rate = clk_get_rate(clk); u300_clockevent_data.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ); @@ -410,7 +420,9 @@ static void __init u300_timer_init_of(struct device_node *np) u300_timer_base + U300_TIMER_APP_RGPT1); /* Set up the IRQ handler */ - setup_irq(irq, &u300_timer_irq); + ret = setup_irq(irq, &u300_timer_irq); + if (ret) + return ret; /* Reset the General Purpose timer 2 */ writel(U300_TIMER_APP_RGPT2_TIMER_RESET, @@ -428,9 +440,12 @@ static void __init u300_timer_init_of(struct device_node *np) u300_timer_base + U300_TIMER_APP_EGPT2); /* Use general purpose timer 2 as clock source */ - if (clocksource_mmio_init(u300_timer_base + U300_TIMER_APP_GPT2CC, - "GPT2", rate, 300, 32, clocksource_mmio_readl_up)) + ret = clocksource_mmio_init(u300_timer_base + U300_TIMER_APP_GPT2CC, + "GPT2", rate, 300, 32, clocksource_mmio_readl_up); + if (ret) { pr_err("timer: failed to initialize U300 clock source\n"); + return ret; + } /* Configure and register the clockevent */ clockevents_config_and_register(&u300_clockevent_data.cevd, rate, @@ -440,7 +455,8 @@ static void __init u300_timer_init_of(struct device_node *np) * TODO: init and register the rest of the timers too, they can be * used by hrtimers! */ + return 0; } -CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer", +CLOCKSOURCE_OF_DECLARE_RET(u300_timer, "stericsson,u300-apptimer", u300_timer_init_of);