Commit 8650b609 authored Apr 24, 2020 by David Gow Committed by Linus Walleij Apr 28, 2020

gpio: of: Build fails if CONFIG_OF_DYNAMIC enabled without CONFIG_OF_GPIO



The symbol 'gpio_of_notifier' doesn't exist without both CONFIG_OF_GPIO
and CONFIG_OF_DYNAMIC enabled, but is referenced when only
CONFIG_OF_DYNAMIC is enabled.

This broke building with 'make ARCH=um allyesconfig':
---------------
/usr/bin/ld: drivers/gpio/gpiolib.o: in function `gpiolib_dev_init':
./drivers/gpio/gpiolib.c:5293: undefined reference to `gpio_of_notifier'
collect2: error: ld returned 1 exit status
---------------

Fixes: 63636d95 ("gpio: of: Add DT overlay support for GPIO hogs")
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200425044655.166257-1-davidgow@google.com


Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 8312d50b

drivers/gpio/gpiolib.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -5312,8 +5312,9 @@ static int __init gpiolib_dev_init(void)
		gpiolib_initialized = true;
		gpiochip_setup_devs();

		if (IS_ENABLED(CONFIG_OF_DYNAMIC))
		#if IS_ENABLED(CONFIG_OF_DYNAMIC) && IS_ENABLED(CONFIG_OF_GPIO)
		WARN_ON(of_reconfig_notifier_register(&gpio_of_notifier));
		#endif /* CONFIG_OF_DYNAMIC && CONFIG_OF_GPIO */

		return ret;
		}

Admin message