From patchwork Tue Jun 28 10:30:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71047 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1515997qgy; Tue, 28 Jun 2016 03:51:54 -0700 (PDT) X-Received: by 10.98.206.77 with SMTP id y74mr625046pfg.55.1467111114157; Tue, 28 Jun 2016 03:51:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 62si33120434pff.74.2016.06.28.03.51.53; Tue, 28 Jun 2016 03:51:54 -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 S1753250AbcF1Kvn (ORCPT + 30 others); Tue, 28 Jun 2016 06:51:43 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:38882 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752170AbcF1Kdg (ORCPT ); Tue, 28 Jun 2016 06:33:36 -0400 Received: by mail-wm0-f49.google.com with SMTP id r201so20902486wme.1 for ; Tue, 28 Jun 2016 03:33:35 -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=3l8xPvPMs/zn6dk1HDAkqB0lPKv7NqxCYAYN3xAOhFQ=; b=UbHITGblZBi1b66iWoPVd97GQRLazL6FPkZu7dCS5AZ+d0PSmxlweNhBgM60SBbjy0 qxzc/mtujKf3c74pZRspq5HRTegRAc+TFw62/DHTzndM7PFmS/RCWcGTgF7Di7j0AKk5 263COSqex4YpA5VJX9DdU9680DZrVnu+Exwys= 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=3l8xPvPMs/zn6dk1HDAkqB0lPKv7NqxCYAYN3xAOhFQ=; b=F2FI6ExNfiu9cA396/liwSZ5EtufJJQ7VOH0niEz80cHEfwazdHlFfAwgrrZFeWFQl EgA04F2eFzitDtvbVdCTy7UjPTqy5SwibD3fc7FXKYhKT6Xt/8Mbr27QL/7TrOZTobwJ VqFQP15UFe6qsPf9FV08FWuObfIx0/0Kax3HNZHUZeT7QsSek2Mj3p1fzo5jvGOntUPK 4FhMFGPKBmG4Y4JGzFZ+QNgKxNHF8hEd/cwJec44ScagPA+hkuY8AA4HNEo06dciM6UC TDUBpzfHiyFJVJTALV80hUtAAh4S3BPu+YpVfoqSAFR1OuWkfKaCT5/6/hjVM8LUR6Ud uBKQ== X-Gm-Message-State: ALyK8tK51nUpi5tJVqw/v3eapQzsQbb0UiT3mkvOc2T9DAtxlf3LZuIDdFZSWvIiQI4H7Ec7 X-Received: by 10.28.164.68 with SMTP id n65mr2896574wme.12.1467110015018; Tue, 28 Jun 2016 03:33:35 -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.33.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:34 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH 34/92] clocksource/drivers/moxart: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:53 +0200 Message-Id: <1467109911-11060-34-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 --- drivers/clocksource/moxart_timer.c | 41 +++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index 19857af..b9c30cd 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -119,34 +119,45 @@ static struct irqaction moxart_timer_irq = { .dev_id = &moxart_clockevent, }; -static void __init moxart_timer_init(struct device_node *node) +static int __init moxart_timer_init(struct device_node *node) { int ret, irq; unsigned long pclk; struct clk *clk; base = of_iomap(node, 0); - if (!base) - panic("%s: of_iomap failed\n", node->full_name); + if (!base) { + pr_err("%s: of_iomap failed\n", node->full_name); + return -ENXIO; + } irq = irq_of_parse_and_map(node, 0); - if (irq <= 0) - panic("%s: irq_of_parse_and_map failed\n", node->full_name); + if (irq <= 0) { + pr_err("%s: irq_of_parse_and_map failed\n", node->full_name); + return -EINVAL; + } ret = setup_irq(irq, &moxart_timer_irq); - if (ret) - panic("%s: setup_irq failed\n", node->full_name); + if (ret) { + pr_err("%s: setup_irq failed\n", node->full_name); + return ret; + } clk = of_clk_get(node, 0); - if (IS_ERR(clk)) - panic("%s: of_clk_get failed\n", node->full_name); + if (IS_ERR(clk)) { + pr_err("%s: of_clk_get failed\n", node->full_name); + return PTR_ERR(clk); + } pclk = clk_get_rate(clk); - if (clocksource_mmio_init(base + TIMER2_BASE + REG_COUNT, - "moxart_timer", pclk, 200, 32, - clocksource_mmio_readl_down)) - panic("%s: clocksource_mmio_init failed\n", node->full_name); + ret = clocksource_mmio_init(base + TIMER2_BASE + REG_COUNT, + "moxart_timer", pclk, 200, 32, + clocksource_mmio_readl_down); + if (ret) { + pr_err("%s: clocksource_mmio_init failed\n", node->full_name); + return ret; + } clock_count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ); @@ -164,5 +175,7 @@ static void __init moxart_timer_init(struct device_node *node) */ clockevents_config_and_register(&moxart_clockevent, pclk, 0x4, 0xfffffffe); + + return 0; } -CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(moxart, "moxa,moxart-timer", moxart_timer_init);