From patchwork Thu Jun 16 21:27: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: 70246 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp466334qgy; Thu, 16 Jun 2016 14:34:05 -0700 (PDT) X-Received: by 10.98.66.208 with SMTP id h77mr7671651pfd.30.1466112845154; Thu, 16 Jun 2016 14:34:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r27si7974040pfi.170.2016.06.16.14.34.04; Thu, 16 Jun 2016 14:34:05 -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 S933408AbcFPVdz (ORCPT + 30 others); Thu, 16 Jun 2016 17:33:55 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38443 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755332AbcFPV3G (ORCPT ); Thu, 16 Jun 2016 17:29:06 -0400 Received: by mail-wm0-f50.google.com with SMTP id m124so86973850wme.1 for ; Thu, 16 Jun 2016 14:29:06 -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=JDsx3T3issRhX4SQjDQ1z8329z1UTr5G2svUZvmsN6c=; b=IqMx8+iiJ8/nc6viXPjohoHXz/Fjz3NxD3FFtvrekrs32tfn9LctRxUG1OVF27cJL1 8g/EnWsqFN8j/od7nvcDhandXD9z7jbztPYkaCr2e7NpCrhCPxp6KiqOEzHSPuSBqxd1 DhsiyfGkpTE3epVWrTI6/a5IY334XB8X6PZCQ= 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=JDsx3T3issRhX4SQjDQ1z8329z1UTr5G2svUZvmsN6c=; b=UaZ7X7QmfZKn2xB2JU84paoFDHUplEoCX5VInQylQcqoCAZbLEyQmFtjggsbtztAHi TJeikwKMnjAPZ20iWkN4mhB3DCjJZb0qoRhSWl5FaRWMYZFkAhbZjJYIqX8DGzJ4YFD5 OU9YbH32+wAtHKAn5C7qp77iqVpcxxAgRDXx71/5GEgKfe2gB9dMR/ghtET5neIwdzLx JUICKNzBXqc3axu1eYA3pIE/h4Ua3/bpNaZsFxgz2DWS09DMUsnPTytiH633l5WQoUFh 5X8fnbrKsyZYdUl/KhXXcegawJh3+YbD0V1B4Gozay3WwMecWtFbOrnyminnfRrmvIT3 5ocQ== X-Gm-Message-State: ALyK8tJjowz5UmO0LyHl2I9GzgXtccBYswx92zSjkqVDtJFwJVoFBNgQtPmXfkW9LnXYYQY3 X-Received: by 10.194.25.135 with SMTP id c7mr1384043wjg.63.1466112545610; Thu, 16 Jun 2016 14:29:05 -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.29.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:04 -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 (moderated list:ARM/STM32 ARCHITE...) Subject: [PATCH V2 47/63] clocksource/drivers/timer-stm32: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:06 +0200 Message-Id: <1466112442-31105-48-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/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);