From patchwork Tue Jun 28 10:31:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71023 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511577qgy; Tue, 28 Jun 2016 03:39:16 -0700 (PDT) X-Received: by 10.66.178.49 with SMTP id cv17mr491658pac.157.1467110356638; Tue, 28 Jun 2016 03:39:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k9si5840915pfj.91.2016.06.28.03.39.16; Tue, 28 Jun 2016 03:39:16 -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 S932168AbcF1KjO (ORCPT + 30 others); Tue, 28 Jun 2016 06:39:14 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:38401 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752899AbcF1KeM (ORCPT ); Tue, 28 Jun 2016 06:34:12 -0400 Received: by mail-wm0-f54.google.com with SMTP id r201so20926274wme.1 for ; Tue, 28 Jun 2016 03:34:11 -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=UmPTBxwIzQJf+X4nYCvFmpfFkFJZMLrwuU2E9CSCG30=; b=RG6CkqPKP8I3iwm1XGOckeVzBP8mc4cSfj3vguK9B6VS0eVC+wIAFC5RMyZ+tyXvM/ LAKDEYbZb8+79FC9exzYt+k4CyxIh61HRnF4f5OVsGYJ5r9DqC/7F5Kl3T2mFpsNKHmD tVpeXzrIio//RNTy4ntRdUAkjv3nrwKznCIHs= 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=UmPTBxwIzQJf+X4nYCvFmpfFkFJZMLrwuU2E9CSCG30=; b=R+v7A6xrDbehHtSqYm30DOj49+R1CSV86RwSv7c8tCpkHxXlU6RFPXnaIR+8MJ5Wx8 U21TQ/gPFdk8wC1Z8mgqX+u8zieBYcvINc9hGFuOhzP0W79r9QeuMvSlQ/F0EERXnG3W t8N5Pi1KyV6ylLdbDhB4MVoB7p0IPZE6ynh2tr4X3Di5OtNzKFcEkDC0RGJGkltC0QGU kXtZBkfK227Bfmx+tQNkMEuLxUzaaCZgjm/KieTu+oYY8rr4SbW5UL4d0a9cjzxX5wOy ujKmUiJNofXuQAEu2lHKWH1N52k/TUpEBh93l+XG8UXS/VFbcwmHA0ezqOWBkx5n0DFG MsDQ== X-Gm-Message-State: ALyK8tJqJMGTRDwZeYZvv0Yj6gvA5kFKbINcKX8I5ngFR3xKfoqcCrgiGZCyeHNIFbLC2tSy X-Received: by 10.28.20.194 with SMTP id 185mr6280139wmu.0.1467110050792; Tue, 28 Jun 2016 03:34:10 -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.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:09 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Maxime Coquelin , linux-arm-kernel@lists.infradead.org Subject: [PATCH 57/92] clocksource/drivers/stm32: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:16 +0200 Message-Id: <1467109911-11060-57-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: Maxime Coquelin --- drivers/clocksource/timer-stm32.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index f3dcb76..d5bf352 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -98,7 +98,7 @@ static struct stm32_clock_event_ddata clock_event_ddata = { }, }; -static void __init stm32_clockevent_init(struct device_node *np) +static int __init stm32_clockevent_init(struct device_node *np) { struct stm32_clock_event_ddata *data = &clock_event_ddata; struct clk *clk; @@ -130,12 +130,14 @@ static void __init stm32_clockevent_init(struct device_node *np) data->base = of_iomap(np, 0); if (!data->base) { + ret = -ENXIO; pr_err("failed to map registers for clockevent\n"); goto err_iomap; } irq = irq_of_parse_and_map(np, 0); if (!irq) { + ret = -EINVAL; pr_err("%s: failed to get irq.\n", np->full_name); goto err_get_irq; } @@ -173,7 +175,7 @@ static void __init stm32_clockevent_init(struct device_node *np) pr_info("%s: STM32 clockevent driver initialized (%d bits)\n", np->full_name, bits); - return; + return ret; err_get_irq: iounmap(data->base); @@ -182,7 +184,7 @@ err_iomap: err_clk_enable: clk_put(clk); err_clk_get: - return; + return ret; } -CLOCKSOURCE_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); +CLOCKSOURCE_OF_DECLARE_RET(stm32, "st,stm32-timer", stm32_clockevent_init);