From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754479AbcEPS2b (ORCPT ); Mon, 16 May 2016 14:28:31 -0400 Received: from AUSXIPPC110.us.dell.com ([143.166.85.200]:9766 "EHLO ausxippc110.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754376AbcEPS23 (ORCPT ); Mon, 16 May 2016 14:28:29 -0400 DomainKey-Signature: s=smtpout; d=dell.com; c=nofws; q=dns; h=X-LoopCount0:X-IronPort-AV:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References; b=zo5HAMZ5/M5QmRF/7dSEZ5QMYrLprbFkHsxylh6xCexSA1MHA7tJgmkD jotU9kZ3RpZ45l+0HubOf461uJvsnsump65xJGf2Fx7+w+XhYHlmMLa4f XPux7TANRWujCJkkgiaz8VzVeJJcIvz0De3G/VneSRtFJzIV8HAIxpXGM U=; X-LoopCount0: from 10.209.151.17 X-IronPort-AV: E=Sophos;i="5.26,627,1459832400"; d="scan'208";a="309882687" From: Mario Limonciello To: ming.lei@canonical.com Cc: LKML , Mario Limonciello Subject: [PATCH v2 3/3] firmware_class: drop support for FW_LOADER_USER_HELPER_FALLBACK Date: Mon, 16 May 2016 13:27:50 -0500 Message-Id: <1463423270-24348-3-git-send-email-mario_limonciello@dell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463423270-24348-1-git-send-email-mario_limonciello@dell.com> References: <1463423270-24348-1-git-send-email-mario_limonciello@dell.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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