From patchwork Thu Jul 7 08:01:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71510 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1271512qgy; Thu, 7 Jul 2016 01:04:04 -0700 (PDT) X-Received: by 10.98.84.197 with SMTP id i188mr2992611pfb.43.1467878640334; Thu, 07 Jul 2016 01:04:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wo10si2939743pab.206.2016.07.07.01.04.00; Thu, 07 Jul 2016 01:04:00 -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 S933579AbcGGIDt (ORCPT + 30 others); Thu, 7 Jul 2016 04:03:49 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37763 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933463AbcGGIDg (ORCPT ); Thu, 7 Jul 2016 04:03:36 -0400 Received: by mail-wm0-f54.google.com with SMTP id a66so21406824wme.0 for ; Thu, 07 Jul 2016 01:03: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=nOzD0qRkHsZ/qCtXoZ++WJrr0zcGmHS6g2GILsxgyuM=; b=R8evKum60MEkffJx8R/uvxJkNfQILio77OYkLil9vRVOIl0AzCvXIz91G0VMDe+q1Y PsNUi2BeD88/g81+cb4KVwtjNkN7g6SavI65CKiV6wiQl2kyWkogfSOR65OT79gjCBbw +hKZhPb75ZcdF1B/YUqftN6e8HdoqvnZpMryk= 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=nOzD0qRkHsZ/qCtXoZ++WJrr0zcGmHS6g2GILsxgyuM=; b=W7Sgl9tDm2dwWmf/lAru3hLDJT0h0CAu9REsjsMmg8NN8Rz/9fr5u8MOpJ0UA7Pjbq BrptK7rc+o8vW8UGzud8PYnhVNq85FLTxJjYU5m6DZTUPOY29bRsg85l5N/65gQh/v+H QDYzviHueLNp2bM1OuDPJalX/qTngqcU9y1PjkTy3D4dLZg0855J4RtgkW5wa969HryH qoe62sHug4L5UsmJT9JDRIfmsBFRB+HtOPWE7fsjf3yxDe1TnvMMgW+GyQ50cZprTngN r4EMPPq/9rw9g1Rx0b9iL0fzacEZ0yNCQuk2z31aCyS+5lyR+pLfmOAo+ngt04lsww4U sysw== X-Gm-Message-State: ALyK8tIIcoveL7wPdWESBSibVRleLXU1v64HyizpLCKe5q8CjR79oFCwitv1jazqyENn+zyr X-Received: by 10.194.9.38 with SMTP id w6mr24036837wja.62.1467878614828; Thu, 07 Jul 2016 01:03:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:34 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, Marc Gonzalez Subject: [PATCH 42/93] clocksource/drivers/tango_xtal: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:15 +0200 Message-Id: <1467878526-1238-42-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 leave the caller unaware of 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 returns an error code from the init function. Signed-off-by: Daniel Lezcano Acked-by: Marc Gonzalez --- drivers/clocksource/tango_xtal.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c index c407c47..7dc716c 100644 --- a/drivers/clocksource/tango_xtal.c +++ b/drivers/clocksource/tango_xtal.c @@ -19,7 +19,7 @@ static u64 notrace read_sched_clock(void) return read_xtal_counter(); } -static void __init tango_clocksource_init(struct device_node *np) +static int __init tango_clocksource_init(struct device_node *np) { struct clk *clk; int xtal_freq, ret; @@ -27,13 +27,13 @@ static void __init tango_clocksource_init(struct device_node *np) xtal_in_cnt = of_iomap(np, 0); if (xtal_in_cnt == NULL) { pr_err("%s: invalid address\n", np->full_name); - return; + return -ENXIO; } clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("%s: invalid clock\n", np->full_name); - return; + return PTR_ERR(clk); } xtal_freq = clk_get_rate(clk); @@ -44,11 +44,13 @@ static void __init tango_clocksource_init(struct device_node *np) 32, clocksource_mmio_readl_up); if (ret) { pr_err("%s: registration failed\n", np->full_name); - return; + return ret; } sched_clock_register(read_sched_clock, 32, xtal_freq); register_current_timer_delay(&delay_timer); + + return 0; } -CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); +CLOCKSOURCE_OF_DECLARE_RET(tango, "sigma,tick-counter", tango_clocksource_init);