diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-26 22:13:57 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-12-03 23:12:39 (GMT) |
commit | 5267720e7515f0fadf4cdef68dccafc18d48c806 (patch) | |
tree | ddce59c3e21410abe539f30d882edf212e777703 | |
parent | 7914a7c5651a51617d952e8fa745000ed8c4f001 (diff) | |
download | linux-5267720e7515f0fadf4cdef68dccafc18d48c806.tar.xz |
spi: Check for spi_of_notifier when CONFIG_OF_DYNAMIC=y
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 <fabio.estevam@freescale.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index bf1cab0..cf4ed29 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; |