From patchwork Thu Jun 16 21:27:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70238 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp465635qgy; Thu, 16 Jun 2016 14:32:05 -0700 (PDT) X-Received: by 10.66.22.134 with SMTP id d6mr7621593paf.35.1466112725737; Thu, 16 Jun 2016 14:32:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oz4si10751189pac.91.2016.06.16.14.32.05; Thu, 16 Jun 2016 14:32:05 -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 S932067AbcFPVcB (ORCPT + 30 others); Thu, 16 Jun 2016 17:32:01 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35446 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755362AbcFPV3Y (ORCPT ); Thu, 16 Jun 2016 17:29:24 -0400 Received: by mail-wm0-f49.google.com with SMTP id v199so207671956wmv.0 for ; Thu, 16 Jun 2016 14:29:24 -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=62+V+FtrgDqz2jTwhqhFybSs8bf02jV04Ww8vyMQGZM=; b=UkqJ7H8z6YwUDN5fdYBIOzTVpZ72iXKgIyzkMyLghvE1PMJUN8kpfYEs6tOeSY5Ib1 X9lOKsmtITVw8+XzIHPx9ckI3X6FopMB1xKiI/gRFZyQWDu93/5eNlnXNxKdR8ul1MIs EatsWtvINOsWKdhJHJyL87odYhKfPO3vTPiRk= 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=62+V+FtrgDqz2jTwhqhFybSs8bf02jV04Ww8vyMQGZM=; b=elLqYgGpwj6lxsHI1qXkWzVySg2ExQVE2a25wrVS5Q97mjgpouUehjwbI3HRd1j56W y0NT9LPT6Mlb7NxhU7/ctn/AcKj02xPr+ClbJ1OjIPh1R/xbelf0w5o6bXCjMWEZfxVh 52EFzUeOtmpm0/mAhihIpnuawioY7/AjsIuTvtOFXnhECwX5vtw/DmvfqdkE4ljf1qQm K7Epp6glyImlS+lhKTgJYuOnBAG8qctLXOexFPwpVRZafIst39gfR1ZY8k+a9lAaVC9Q PnBaHGj0sIfSuCJKlmW1cAKS9qzLyZlc3twpN+3ckpeocb4B8uNpSd6MEPuDpP7Ywn2U 0Pog== X-Gm-Message-State: ALyK8tJLl1Xh/XKBvAXHQeFfm4qXQrc4qRCAKjxwDlZe0pc2ytEx4h5MRp6JWmXgW97lnzdc X-Received: by 10.28.140.194 with SMTP id o185mr5152578wmd.86.1466112563282; Thu, 16 Jun 2016 14:29:23 -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 x128sm16705606wmf.6.2016.06.16.14.29.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:22 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, John Crispin , Ralf Baechle , linux-mips@linux-mips.org (open list:RALINK MIPS ARCHI...) Subject: [PATCH V2 57/63] clocksource/drivers/ralink: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:16 +0200 Message-Id: <1466112442-31105-58-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> References: <1466112442-31105-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 --- arch/mips/ralink/cevt-rt3352.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c index 3ad0b07..f2d3c79 100644 --- a/arch/mips/ralink/cevt-rt3352.c +++ b/arch/mips/ralink/cevt-rt3352.c @@ -117,11 +117,13 @@ static int systick_set_oneshot(struct clock_event_device *evt) return 0; } -static void __init ralink_systick_init(struct device_node *np) +static int __init ralink_systick_init(struct device_node *np) { + int ret; + systick.membase = of_iomap(np, 0); if (!systick.membase) - return; + return -ENXIO; systick_irqaction.name = np->name; systick.dev.name = np->name; @@ -131,16 +133,21 @@ static void __init ralink_systick_init(struct device_node *np) systick.dev.irq = irq_of_parse_and_map(np, 0); if (!systick.dev.irq) { pr_err("%s: request_irq failed", np->name); - return; + return -EINVAL; } - clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name, - SYSTICK_FREQ, 301, 16, clocksource_mmio_readl_up); + ret = clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name, + SYSTICK_FREQ, 301, 16, + clocksource_mmio_readl_up); + if (ret) + return ret; clockevents_register_device(&systick.dev); pr_info("%s: running - mult: %d, shift: %d\n", np->name, systick.dev.mult, systick.dev.shift); + + return 0; } -CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); +CLOCKSOURCE_OF_DECLARE_RET(systick, "ralink,cevt-systick", ralink_systick_init);