From patchwork Thu Jul 7 08:01:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71514 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1272043qgy; Thu, 7 Jul 2016 01:05:15 -0700 (PDT) X-Received: by 10.66.52.106 with SMTP id s10mr49683753pao.65.1467878715342; Thu, 07 Jul 2016 01:05:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oi7si3003633pab.13.2016.07.07.01.05.14; Thu, 07 Jul 2016 01:05:15 -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 S1030417AbcGGIEo (ORCPT + 30 others); Thu, 7 Jul 2016 04:04:44 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36975 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030256AbcGGIDz (ORCPT ); Thu, 7 Jul 2016 04:03:55 -0400 Received: by mail-wm0-f49.google.com with SMTP id a66so21417151wme.0 for ; Thu, 07 Jul 2016 01:03:55 -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=HykNBqgju1ILIMtrfyDsiD4lsPGMILcidXLjwGZvQYWtHKV44dXo7gWlh5NCObcbTO m3diNYGdbnRmque8yijfLg/PuZMBU/uPdE+EUJfvWvHEuZJeSov9k8rkaUHi2LjQEJf9 vUxtGcLSeKyYNl/Eoid+PFG84SXz6oVSX40kQ= 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=NK7HhM73JE/7og1MyxgCv4r3nrgusGtycePMF5OhjUqYr3SATdOfqT2MEUrNkLAg1s kYVrEQ2c8WoGLQURPJ4ji+byyZPCwWXWJwsQsD6ZCz+jwIltUecbuRkttyIy6vJLLtmb WIIIaIQ9UTHi9m1yS3LBnIk17qtsE4v7eCcScOa08aqfy0b1rPFGYfVPP5OK/Tti71B1 D/y/kSTUSdGnuju0IEfaHcjDFUQAWjgQcic6SDT5pk0NTOg5dXbRI8mOdZPFrbkSfJxt iqkPvUD75/jbbnP9ql0Ahn6JkWsAVt/Sx8rE+J46VHOj8lVQ3AsGgFjMFx9WsFCcyV1D 0JkQ== X-Gm-Message-State: ALyK8tIQBENpptJzOU2s90MEIvQRiozqI8/CAP8lIxq9WY2NVyuqfGN3mcIai2SHePbPrrPH X-Received: by 10.194.37.166 with SMTP id z6mr23801799wjj.77.1467878634560; Thu, 07 Jul 2016 01:03:54 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:54 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, Maxime Coquelin , linux-arm-kernel@lists.infradead.org Subject: [PATCH 57/93] clocksource/drivers/stm32: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:30 +0200 Message-Id: <1467878526-1238-57-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 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);