From patchwork Wed Nov 26 22:13:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 5388921 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 77D679F319 for ; Wed, 26 Nov 2014 22:14:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 902FF201C0 for ; Wed, 26 Nov 2014 22:14:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78392201EC for ; Wed, 26 Nov 2014 22:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750828AbaKZWOS (ORCPT ); Wed, 26 Nov 2014 17:14:18 -0500 Received: from mail-qc0-f174.google.com ([209.85.216.174]:39681 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbaKZWOS (ORCPT ); Wed, 26 Nov 2014 17:14:18 -0500 Received: by mail-qc0-f174.google.com with SMTP id c9so2761963qcz.19 for ; Wed, 26 Nov 2014 14:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=baK8tnjB041cxUsQSrdyR3FjU47cPGCI+qmgqxiGAec=; b=V/YSCcTwyloyUThPRcDJHV5Q6h6KXZIj7rMP09yp/2mUYuB/TkTrErswwySJYWZQaA 5zzSwgm3SudUFZ9YzRnMdKJh+8SFtvSEA/yjbSe/L8BN1oh3ZTXtHRhrFtcM+aWos85w iN11uJuHxFtpY+lNfSATL5zSKTeQX/9660NrroIY5AxnA+l9jZ7cQ6ZGBd4Z7N4PQVc9 IzptNtSjEfy8hFyeCC+BoM8O4B9LPkzQU4AA0tpP3w+f2JA9mdsFDf15ciF89zBFpVG2 uquZDPF3e1546BoM7sm/1TR6CPkAdwn8UB4WFHCSIzhZpVAGpnFQ2GvxrQFcg29YKVFR R7Zg== X-Received: by 10.140.83.169 with SMTP id j38mr12056261qgd.99.1417040057509; Wed, 26 Nov 2014 14:14:17 -0800 (PST) Received: from localhost.localdomain ([201.82.52.106]) by mx.google.com with ESMTPSA id g12sm5012468qay.44.2014.11.26.14.14.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 14:14:16 -0800 (PST) From: Fabio Estevam To: broonie@kernel.org Cc: pantelis.antoniou@konsulko.com, grant.likely@linaro.org, linux-spi@vger.kernel.org, Fabio Estevam Subject: [PATCH] spi: Check for spi_of_notifier when CONFIG_OF_DYNAMIC=y Date: Wed, 26 Nov 2014 20:13:57 -0200 Message-Id: <1417040037-22522-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam Since commit ce79d54ae447d651173 ("spi/of: Add OF notifier handler") the following warning is seen on a imx53 system that has CONFIG_OF_DYNAMIC=n: [ 0.048119] ------------[ cut here ]------------ [ 0.048146] WARNING: CPU: 0 PID: 1 at drivers/spi/spi.c:2419 spi_init+0x60/0xa8() [ 0.048158] Modules linked in: [ 0.048183] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.18.0-rc6-next-20141126-00003-g9388e85 #2080 [ 0.048193] Hardware name: Freescale i.MX53 (Device Tree Support) [ 0.048203] Backtrace: [ 0.048235] [<80011f74>] (dump_backtrace) from [<80012110>] (show_stack+0x18/0x1c) [ 0.048246] r6:00000973 r5:00000000 r4:00000000 r3:00000000 [ 0.048284] [<800120f8>] (show_stack) from [<806b3ad8>] (dump_stack+0x88/0xa4) [ 0.048312] [<806b3a50>] (dump_stack) from [<8002a55c>] (warn_slowpath_common+0x80/0xbc) [ 0.048320] r5:8096cfcc r4:00000000 [ 0.048343] [<8002a4dc>] (warn_slowpath_common) from [<8002a5bc>] (warn_slowpath_null+0x24/0x2c) [ 0.048354] r8:8096cf6c r7:809355ec r6:ddcd7c00 r5:812029e4 r4:00000000 [ 0.048389] [<8002a598>] (warn_slowpath_null) from [<8096cfcc>] (spi_init+0x60/0xa8) [ 0.048405] [<8096cf6c>] (spi_init) from [<80008a7c>] (do_one_initcall+0x88/0x1e0) [ 0.048415] r5:8099e018 r4:8099e018 [ 0.048438] [<800089f4>] (do_one_initcall) from [<80935e38>] (kernel_init_freeable+0x110/0x1e0) [ 0.048448] r10:80980700 r9:809806e4 r8:000000cc r7:809355ec r6:809f8940 r5:00000002 [ 0.048478] r4:8098d744 [ 0.048508] [<80935d28>] (kernel_init_freeable) from [<806ae574>] (kernel_init+0x10/0xf4) [ 0.048517] r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:806ae564 [ 0.048547] r4:00000000 [ 0.048565] [<806ae564>] (kernel_init) from [<8000ed68>] (ret_from_fork+0x14/0x2c) [ 0.048574] r4:00000000 r3:00000000 [ 0.048616] ---[ end trace 405a65d177dae4fd ]--- Only check of_reconfig_notifier_register() in the CONFIG_OF_DYNAMIC=y case, as intended by commit ce79d54ae447d65. Signed-off-by: Fabio Estevam --- drivers/spi/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 8a0e4b0..4431a57 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2415,7 +2415,7 @@ static int __init spi_init(void) if (status < 0) goto err2; - if (IS_ENABLED(CONFIG_OF)) + if (IS_ENABLED(CONFIG_OF_DYNAMIC)) WARN_ON(of_reconfig_notifier_register(&spi_of_notifier)); return 0;