From patchwork Thu Jul 7 08:01:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71559 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1280867qgy; Thu, 7 Jul 2016 01:28:17 -0700 (PDT) X-Received: by 10.66.248.35 with SMTP id yj3mr49504701pac.138.1467880096445; Thu, 07 Jul 2016 01:28:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5si3067129pac.165.2016.07.07.01.28.16; Thu, 07 Jul 2016 01:28: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 S933680AbcGGI2B (ORCPT + 30 others); Thu, 7 Jul 2016 04:28:01 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35321 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933432AbcGGIDc (ORCPT ); Thu, 7 Jul 2016 04:03:32 -0400 Received: by mail-wm0-f47.google.com with SMTP id z126so138052763wme.0 for ; Thu, 07 Jul 2016 01:03:31 -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=wM5uEeWcaog5Ml9N+T8YEDHghU308ixx2ohA5A9ZsmM=; b=kuWkicVLV3iub0N02GOalC9HxMNMqiXawRpeGyRppmCIykIjRkLaSzC0+ohMdtCVD9 5e3eW0wsvkXF+J2cpQZKbCzgQGo1QPijFPUKUceBamHos9IqiaU1NQkSo8Wqvz6LGU2+ 3zXUeOjZY29sXrQqNDdNPqKbIN6ECzm8oOMGE= 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=wM5uEeWcaog5Ml9N+T8YEDHghU308ixx2ohA5A9ZsmM=; b=HyiFtZ7ZgxILyKWTfh0hZQUu6SEjJpHse0kBd5rYUrNntw7aV/YUj0sf2eIMAFSIA+ 3blxdNz3lk5QKnRC3unRldblcc6MWD1N7r0Ug3RsuwMXD+hqdqOOtAhnep14Ovoydg8l HrBXiNDPyPiOIYyr75sIyNkd/i/wHs3difBCvOHUG075DYY1hlAQva6fqhTY5NSHaQ7z pIQvsl6G+vTxcOziVcZTn1LckQxlUKHp4HjH7UQfkLnWbwfgviV6u+8CmAuNPT77kEFM Og6GfiEGyjGe0RLtSWHJ6lWfjLk7OkFgDB/y8YOdgfwZuRufctUKA/y3fdbjC487uCZG IImg== X-Gm-Message-State: ALyK8tJ6HG3rNuLHMHTU+jtXAaEmx/avbFSCAFsv0mm79Vqm7a/fLjUHp4piP5aPrheM3qP6 X-Received: by 10.28.136.21 with SMTP id k21mr1478733wmd.24.1467878610839; Thu, 07 Jul 2016 01:03:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:30 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 39/93] clocksource/drivers/qcom: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:12 +0200 Message-Id: <1467878526-1238-39-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/qcom-timer.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index f8e09f9..79f73bd 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -178,7 +178,7 @@ static struct delay_timer msm_delay_timer = { .read_current_timer = msm_read_current_timer, }; -static void __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq, +static int __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq, bool percpu) { struct clocksource *cs = &msm_clocksource; @@ -218,12 +218,14 @@ err: sched_clock_register(msm_sched_clock_read, sched_bits, dgt_hz); msm_delay_timer.freq = dgt_hz; register_current_timer_delay(&msm_delay_timer); + + return res; } -static void __init msm_dt_timer_init(struct device_node *np) +static int __init msm_dt_timer_init(struct device_node *np) { u32 freq; - int irq; + int irq, ret; struct resource res; u32 percpu_offset; void __iomem *base; @@ -232,34 +234,35 @@ static void __init msm_dt_timer_init(struct device_node *np) base = of_iomap(np, 0); if (!base) { pr_err("Failed to map event base\n"); - return; + return -ENXIO; } /* We use GPT0 for the clockevent */ irq = irq_of_parse_and_map(np, 1); if (irq <= 0) { pr_err("Can't get irq\n"); - return; + return -EINVAL; } /* We use CPU0's DGT for the clocksource */ if (of_property_read_u32(np, "cpu-offset", &percpu_offset)) percpu_offset = 0; - if (of_address_to_resource(np, 0, &res)) { + ret = of_address_to_resource(np, 0, &res); + if (ret) { pr_err("Failed to parse DGT resource\n"); - return; + return ret; } cpu0_base = ioremap(res.start + percpu_offset, resource_size(&res)); if (!cpu0_base) { pr_err("Failed to map source base\n"); - return; + return -EINVAL; } if (of_property_read_u32(np, "clock-frequency", &freq)) { pr_err("Unknown frequency\n"); - return; + return -EINVAL; } event_base = base + 0x4; @@ -268,7 +271,7 @@ static void __init msm_dt_timer_init(struct device_node *np) freq /= 4; writel_relaxed(DGT_CLK_CTL_DIV_4, source_base + DGT_CLK_CTL); - msm_timer_init(freq, 32, irq, !!percpu_offset); + return msm_timer_init(freq, 32, irq, !!percpu_offset); } -CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); -CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(scss_timer, "qcom,scss-timer", msm_dt_timer_init);