From patchwork Thu Sep 8 13:58:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 75800 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp859408qgf; Thu, 8 Sep 2016 06:58:55 -0700 (PDT) X-Received: by 10.66.144.200 with SMTP id so8mr91965579pab.94.1473343135444; Thu, 08 Sep 2016 06:58:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tf1si47293431pab.230.2016.09.08.06.58.55; Thu, 08 Sep 2016 06:58:55 -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 S1758297AbcIHN6g (ORCPT + 27 others); Thu, 8 Sep 2016 09:58:36 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36263 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758141AbcIHN6e (ORCPT ); Thu, 8 Sep 2016 09:58:34 -0400 Received: by mail-wm0-f51.google.com with SMTP id b187so170673733wme.1 for ; Thu, 08 Sep 2016 06:58:34 -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=zsRJ41KojwgLKA4/ACv4tQmUhl+cTrmv58uJZjwsyY8=; b=RMQjyqtIocuP1PxgUS54LVO6+y3Ns29mEnOMUoutG+4HxrSoclOpBz/E7yp4ffo0Hu zt2SEEl4N0uIgaaJd7E0M8z4LkXZ97SvZkddbU60nGuJvQNXmlddvltJ7aqp4pK8CC3i FxIcX6YfEcS8LL0XtxqnnORoJA99zyLCrd3uQ= 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=zsRJ41KojwgLKA4/ACv4tQmUhl+cTrmv58uJZjwsyY8=; b=QgauFisjVIvoI5w9iuNtXFUT7v+XLf8kmlJySOwYiBf4NqDmEGpFZ2MiU1KzNjfPcw j6Ag4akX9vWcn/8+zkBGDotaVZG5gkFVCE7vO0vEocJSo6qNxp9Ph33dEzHqI66XD8Hh PHKvx3eohfMVjQcYuSeu09z1St9o0BPPkTtXlYhVzROHjRiQWuAPnMzjF8LTelIf4qsP DYjC50M+589ISP55HmZMeGG8ZHYuCojjnc0dkBWrQku0xesDExLbzSJcx0ogNpL5p0GF 9n5xkb6+BZgcw5weezGd0zEV2JYNrZGOubn4OnfuAtuMtXBz+dgkcSaCXIc02ty9i4ee amVw== X-Gm-Message-State: AE9vXwPj59SD77NUeKRS6We/xPQH9I9/dZG76JVQC1P+hmA9MZaem53cXBIreIQo69WLiMCt X-Received: by 10.195.12.4 with SMTP id em4mr19198255wjd.32.1473343113252; Thu, 08 Sep 2016 06:58:33 -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 e12sm9803270wmg.17.2016.09.08.06.58.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 06:58:30 -0700 (PDT) From: Daniel Lezcano To: joel@jms.id.au Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] clocksource/drivers/moxart: Replace panic by pr_err Date: Thu, 8 Sep 2016 15:58:10 +0200 Message-Id: <1473343090-29208-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473343090-29208-1-git-send-email-daniel.lezcano@linaro.org> References: <1473343090-29208-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 clksrc-of code is supposed to catch the return code and fail gracefully. Don't panic on error, but print the error and exit with a relevant error code. Signed-off-by: Daniel Lezcano --- drivers/clocksource/moxart_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.9.1 Acked-by: Joel Stanley diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index cba25b7..2a8f470 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -184,8 +184,10 @@ static int __init moxart_timer_init(struct device_node *node) } else if (of_device_is_compatible(node, "aspeed,ast2400-timer")) { timer->t1_enable_val = ASPEED_TIMER1_ENABLE; timer->t1_disable_val = ASPEED_TIMER1_DISABLE; - } else - panic("%s: unknown platform\n", node->full_name); + } else { + pr_err("%s: unknown platform\n", node->full_name); + return -EINVAL; + } timer->count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ);