From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754153AbbGWRbP (ORCPT ); Thu, 23 Jul 2015 13:31:15 -0400 Received: from foss.arm.com ([217.140.101.70]:41437 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753650AbbGWRbN (ORCPT ); Thu, 23 Jul 2015 13:31:13 -0400 From: Sudeep Holla To: linux-kernel@vger.kernel.org Cc: Sudeep Holla , Rob Herring , Daniel Lezcano , Thomas Gleixner Subject: [PATCH] clocksource/OF: remove invalid DT warnings when booting using ACPI Date: Thu, 23 Jul 2015 18:31:06 +0100 Message-Id: <1437672666-4121-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since both CONFIG_ACPI and CONFIG_CLKSRC_OF can be enabled on ARM64, we get this device tree warnings even when booting using ACPI which is not valid. We can use of_have_populated_dt to check if the device tree is populated or not and avoid spurious warning. This patch uses of_have_populated_dt to remove this non legitimate device tree warning when booting using ACPI tables. Signed-off-by: Sudeep Holla Cc: Rob Herring Cc: Daniel Lezcano Cc: Thomas Gleixner --- drivers/clocksource/clksrc-of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index 0093a8e49e14..47823a2d7220 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -38,6 +38,6 @@ void __init clocksource_of_init(void) init_func(np); clocksources++; } - if (!clocksources) + if (of_have_populated_dt() && !clocksources) pr_crit("%s: no matching clocksources found\n", __func__); } -- 1.9.1