hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware_loader: move CONFIG_FW_LOADER_USER_HELPER switch to Makefile 

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>
This commit is contained in:
Masahiro Yamada 2019-01-11 18:51:32 +09:00 committed by Greg Kroah-Hartman
parent 925f8d4aad
commit 91f382a468
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/firmware_loader/Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Makefile for the Linux firmware loader # 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 obj-$(CONFIG_FW_LOADER) += firmware_class.o
firmware_class-objs := main.o firmware_class-objs := main.o
firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o

5
drivers/base/firmware_loader/fallback_table.c
View File

@ -16,9 +16,6 @@
* firmware fallback configuration table * firmware fallback configuration table
*/ */
/* Module or buit-in */
#ifdef CONFIG_FW_LOADER_USER_HELPER
static unsigned int zero; static unsigned int zero;
static unsigned int one = 1; static unsigned int one = 1;
@ -51,5 +48,3 @@ struct ctl_table firmware_config_table[] = {
{ } { }
}; };
EXPORT_SYMBOL_GPL(firmware_config_table); EXPORT_SYMBOL_GPL(firmware_config_table);
#endif