The last consumer of this is dell_rbu, and it no longer needs this due to userspace changes in how updates are passed to the OS.
Signed-off-by: Mario Limonciello <[email protected]> --- drivers/base/Kconfig | 14 -------------- drivers/base/firmware_class.c | 9 ++------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 98504ec..55e6ed1 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -151,20 +151,6 @@ config EXTRA_FIRMWARE_DIR config FW_LOADER_USER_HELPER bool -config FW_LOADER_USER_HELPER_FALLBACK - bool "Fallback user-helper invocation for firmware loading" - depends on FW_LOADER - select FW_LOADER_USER_HELPER - help - This option enables / disables the invocation of user-helper - (e.g. udev) for loading firmware files as a fallback after the - direct file loading in kernel fails. The user-mode helper is - no longer required unless you have a special firmware file that - resides in a non-standard path. Moreover, the udev support has - been deprecated upstream. - - If you are unsure about this, say N here. - config WANT_DEV_COREDUMP bool help diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 773fc30..3da4f31 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -106,11 +106,6 @@ static inline long firmware_loading_timeout(void) #else #define FW_OPT_USERHELPER 0 #endif -#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK -#define FW_OPT_FALLBACK FW_OPT_USERHELPER -#else -#define FW_OPT_FALLBACK 0 -#endif #define FW_OPT_NO_WARN (1U << 3) struct firmware_cache { @@ -1185,7 +1180,7 @@ request_firmware(const struct firmware **firmware_p, const char *name, /* Need to pin this module until return */ __module_get(THIS_MODULE); ret = _request_firmware(firmware_p, name, device, - FW_OPT_UEVENT | FW_OPT_FALLBACK); + FW_OPT_UEVENT); module_put(THIS_MODULE); return ret; } @@ -1301,7 +1296,7 @@ request_firmware_nowait( fw_work->device = device; fw_work->context = context; fw_work->cont = cont; - fw_work->opt_flags = FW_OPT_NOWAIT | FW_OPT_FALLBACK | + fw_work->opt_flags = FW_OPT_NOWAIT | (uevent ? FW_OPT_UEVENT : FW_OPT_USERHELPER); if (!try_module_get(module)) { -- 2.7.4
