From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934327AbeAKOjh (ORCPT + 1 other); Thu, 11 Jan 2018 09:39:37 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:60784 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932986AbeAKOjf (ORCPT ); Thu, 11 Jan 2018 09:39:35 -0500 From: Sudeep Holla To: linux-kernel@vger.kernel.org Cc: Sudeep Holla , Arnd Bergmann , Olof Johansson , Brian Norris , Gregory Fong , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH -next] soc: brcmstb: biuctrl: exit without warning on non brcmstb platforms Date: Thu, 11 Jan 2018 14:39:24 +0000 Message-Id: <1515681564-24007-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Currently if this driver is included, we get the following warning on any platforms irrespective of whether it's brcmstb platform or not. " brcmstb: biuctrl: missing BIU control node brcmstb: biuctrl: MCP: Unable to disable write pairing! " This patch allows to exit early without any warning messages on non brcmstb platforms as it's meaningless for them. Cc: Brian Norris Cc: Gregory Fong Cc: Florian Fainelli Cc: bcm-kernel-feedback-list@broadcom.com Signed-off-by: Sudeep Holla --- drivers/soc/bcm/brcmstb/biuctrl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) Hi, I am seeing these messages on my Juno platform when running -next Regards, Sudeep diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index 2b23ae7b5e9b..0d0c6131ac0e 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -162,17 +162,11 @@ static void __init mcp_b53_set(void) cbc_writel(reg, CPU_WRITEBACK_CTRL_REG); } -static int __init setup_hifcpubiuctrl_regs(void) +static int __init setup_hifcpubiuctrl_regs(struct device_node *np) { - struct device_node *np, *cpu_dn; + struct device_node *cpu_dn; int ret = 0; - np = of_find_compatible_node(NULL, NULL, "brcm,brcmstb-cpu-biu-ctrl"); - if (!np) { - pr_err("missing BIU control node\n"); - return -ENODEV; - } - cpubiuctrl_base = of_iomap(np, 0); if (!cpubiuctrl_base) { pr_err("failed to remap BIU control base\n"); @@ -243,8 +237,13 @@ static struct syscore_ops brcmstb_cpu_credit_syscore_ops = { static int __init brcmstb_biuctrl_init(void) { int ret; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "brcm,brcmstb-cpu-biu-ctrl"); + if (!np) + return -ENODEV; - setup_hifcpubiuctrl_regs(); + setup_hifcpubiuctrl_regs(np); ret = mcp_write_pairing_set(); if (ret) { -- 2.7.4