[PATCH] firmware: remove old CONFIG_FW_LOADER_MODULE test

From: Greg Kroah-Hartman
Date: Thu Dec 30 2021 - 04:39:44 EST


The CONFIG_FW_LOADER_MODULE check in firmware.h is very obsolete given
that this symbol went away decades ago, so it should be removed.

Reported-by: Borislav Petkov <bp@xxxxxxxxx>
Cc: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/linux/firmware.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 3b057dfc8284..0b1c4d9c5465 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -34,7 +34,7 @@ static inline bool firmware_request_builtin(struct firmware *fw,
}
#endif

-#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
+#if defined(CONFIG_FW_LOADER)
int request_firmware(const struct firmware **fw, const char *name,
struct device *device);
int firmware_request_nowarn(const struct firmware **fw, const char *name,
--
2.34.1