From patchwork Thu Jun 16 21:26:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70211 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp464395qgy; Thu, 16 Jun 2016 14:28:36 -0700 (PDT) X-Received: by 10.107.4.78 with SMTP id 75mr12044267ioe.52.1466112514123; Thu, 16 Jun 2016 14:28:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u4si20618946pal.94.2016.06.16.14.28.33; Thu, 16 Jun 2016 14:28:34 -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 S1755160AbcFPV2Q (ORCPT + 30 others); Thu, 16 Jun 2016 17:28:16 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:34964 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755101AbcFPV2N (ORCPT ); Thu, 16 Jun 2016 17:28:13 -0400 Received: by mail-wm0-f53.google.com with SMTP id v199so207644287wmv.0 for ; Thu, 16 Jun 2016 14:28:12 -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=tuSw4M2QZ3aF9H6xSeunLzVjvaYmZSOhc+bQLtlpcIA=; b=cvy3ytZOaCMEfggarQwuvTjritKAyABZb9qlJuAolD8tczE5P5Y3ZYId5pzZkKGJQI xuHyP5raVv1XUAn4Ia7UPGXVRRlg1rOSRENJxpyrlACdsAhWEknCcBUiWDi9fTqrY6Pq WxxLPkjV0qg5Y17ehozwbeAXrTG5wUme1PmHs= 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=tuSw4M2QZ3aF9H6xSeunLzVjvaYmZSOhc+bQLtlpcIA=; b=Gy/DFe3cqQOi92UFzz/dDas9ZnAxVHStjP46Sl65L0ay/rkTn8KINUrEbvOJljgQ4P 2An3uVv8AbjdZEgFM5kemvAQShyJQYN2C2aJ+WDtNl4URKQr+UYYpCgRLdF1R1DmxhP9 ZuJU7Imh6tYexzDO6AGBznuGn+CWAwb3Yfe1kUvGiQp9yW0r0kA8pDPQyuGuVxS6v2WL 6BwsgouH69MrZyd11F1vXy6ugYg+IIXkAlfHxg1Cq3r4NF+K+xAgqkDNJMkHdPMO46x6 qPJ+JGyi+wcDjW6tdJElJOVbJXn3ZYbRR6qG2EsmolXj/hztEV0QxXyelNsnr/27lgT/ 3D8g== X-Gm-Message-State: ALyK8tLgdF539gSHe+tAAUEjJuKDluU/iH/1NObqoxpEkBZ+36azyU/PE7dWS7ELLFXywRK6 X-Received: by 10.194.151.73 with SMTP id uo9mr1325304wjb.177.1466112492066; Thu, 16 Jun 2016 14:28:12 -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.28.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:11 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 09/63] clocksource/drivers/dw_apb_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:28 +0200 Message-Id: <1466112442-31105-10-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 --- drivers/clocksource/dw_apb_timer_of.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index 860843c..4985a2c 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -143,7 +143,7 @@ static struct delay_timer dw_apb_delay_timer = { #endif static int num_called; -static void __init dw_apb_timer_init(struct device_node *timer) +static int __init dw_apb_timer_init(struct device_node *timer) { switch (num_called) { case 0: @@ -164,8 +164,10 @@ static void __init dw_apb_timer_init(struct device_node *timer) } num_called++; + + return 0; } -CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init);