From patchwork Thu Jul 7 08:01:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71512 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1271849qgy; Thu, 7 Jul 2016 01:04:51 -0700 (PDT) X-Received: by 10.98.69.199 with SMTP id n68mr2960095pfi.160.1467878691096; Thu, 07 Jul 2016 01:04:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i1si2938738pfj.61.2016.07.07.01.04.50; Thu, 07 Jul 2016 01:04:51 -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 S1030431AbcGGIEr (ORCPT + 30 others); Thu, 7 Jul 2016 04:04:47 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36116 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030272AbcGGID6 (ORCPT ); Thu, 7 Jul 2016 04:03:58 -0400 Received: by mail-wm0-f42.google.com with SMTP id f126so200145658wma.1 for ; Thu, 07 Jul 2016 01:03:57 -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=bKl0ObXKp2hPd9kxLK2a2FwyS/cuYqhkvMIaJuwJhzY=; b=Zzf1HmE02hJ2Sc3VkzOvZUuGrnedoWCnHA3RMpZMQu7Nj03vj/JsktvEUFx3NfKEdt f54hN+/t3Pn5k7H681LNLqfInbnzQ/wlKOZ26I7cwOYOb4ZVTdacBgvTK6E6Nfs4k7L6 3KEIX7t6HjiL1SKMhL5IEY5inRpM9muAT4bpI= 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=bKl0ObXKp2hPd9kxLK2a2FwyS/cuYqhkvMIaJuwJhzY=; b=WXsN9G250AkrAL+3SQbxy9SFozW6433d4BodWGPaHwDixmf0FS6G/NYmhgY0fgM/oV idGAqlE4uUA1mFcTANlHjnTKs0f+BzrwhYNyMVkaVwr3CQY0ttzPEPMDHiySXcMLcbfz 0JvNZ0Y28W+o7+Za3hpMMDjT73rNqGbSOQoePLTmq16EsXDRV0M/rCvTjpLc1sptnOng VxUTpsW71ex5ZMXZCm2eLOjgMl7nMgXqJAG68MDuwwEzwXy03iTxkIVbbxLVGvX6O9mw 9eWdVUEhnX57l8ePYf3TbnLnLjIYWEtJf2a4KpzseNb2RXcLnmlwdpygIYLIjiiujf/7 plEA== X-Gm-Message-State: ALyK8tJSkKQS2HN8HJwmhU0ge79xs8QTx1UYtkFtx7tyX6zAbOWKf6tU0cGx4RI8/Q5OxFLd X-Received: by 10.28.188.137 with SMTP id m131mr24325450wmf.4.1467878636957; Thu, 07 Jul 2016 01:03:56 -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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:56 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 59/93] clocksource/drivers/ti-32k: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:32 +0200 Message-Id: <1467878526-1238-59-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/timer-ti-32k.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c index 8518d9d..e4ad3c6e 100644 --- a/drivers/clocksource/timer-ti-32k.c +++ b/drivers/clocksource/timer-ti-32k.c @@ -88,14 +88,14 @@ static u64 notrace omap_32k_read_sched_clock(void) return ti_32k_read_cycles(&ti_32k_timer.cs); } -static void __init ti_32k_timer_init(struct device_node *np) +static int __init ti_32k_timer_init(struct device_node *np) { int ret; ti_32k_timer.base = of_iomap(np, 0); if (!ti_32k_timer.base) { pr_err("Can't ioremap 32k timer base\n"); - return; + return -ENXIO; } ti_32k_timer.counter = ti_32k_timer.base; @@ -116,11 +116,13 @@ static void __init ti_32k_timer_init(struct device_node *np) ret = clocksource_register_hz(&ti_32k_timer.cs, 32768); if (ret) { pr_err("32k_counter: can't register clocksource\n"); - return; + return ret; } sched_clock_register(omap_32k_read_sched_clock, 32, 32768); pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n"); + + return 0; } -CLOCKSOURCE_OF_DECLARE(ti_32k_timer, "ti,omap-counter32k", +CLOCKSOURCE_OF_DECLARE_RET(ti_32k_timer, "ti,omap-counter32k", ti_32k_timer_init);