firmware_loader: move CONFIG_FW_LOADER_USER_HELPER switch to Makefile (91f382a4) · Commits · 戴 / test

The whole code of fallback_table.c is surrounded by #ifdef of CONFIG_FW_LOADER_USER_HELPER. Move the CONFIG_FW_LOADER_USER_HELPER switch to Makefile so that it is not compiled at all when this CONFIG option is disabled. I also removed the confusing comment, "Module or buit-in [sic]". CONFIG_FW_LOADER_USER_HELPER is a boolean option. (If it were a module, CONFIG_FW_LOADER_USER_HELPER_MODULE would be defined instead.) Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/base/firmware_loader/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		# Makefile for the Linux firmware loader

		obj-y := fallback_table.o
		obj-$(CONFIG_FW_LOADER_USER_HELPER) += fallback_table.o
		obj-$(CONFIG_FW_LOADER) += firmware_class.o
		firmware_class-objs := main.o
		firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o

drivers/base/firmware_loader/fallback_table.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@
		* firmware fallback configuration table
		*/

		/* Module or buit-in */
		#ifdef CONFIG_FW_LOADER_USER_HELPER

		static unsigned int zero;
		static unsigned int one = 1;

		@@ -51,5 +48,3 @@ struct ctl_table firmware_config_table[] = {
		{ }
		};
		EXPORT_SYMBOL_GPL(firmware_config_table);

		#endif

Admin message