[PATCH 08/14] firmware_loader: move struct builtin_fw to the only place used
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
Date: 2021-09-17 18:23:29
Also in:
linux-fsdevel, lkml
Subsystem:
driver core, kobjects, debugfs and sysfs, firmware loader (request_firmware), the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Luis Chamberlain, Russ Weight, Linus Torvalds
From: Luis Chamberlain <mcgrof@kernel.org> Now that x86 doesn't abuse picking at internals to the firmware loader move out the built-in firmware struct to its only user. Reviewed-by: Borislav Petkov <redacted> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/base/firmware_loader/builtin/main.c | 6 ++++++ include/linux/firmware.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/firmware_loader/builtin/main.c b/drivers/base/firmware_loader/builtin/main.c
index 2af0e58f3f9f..0c78adb39110 100644
--- a/drivers/base/firmware_loader/builtin/main.c
+++ b/drivers/base/firmware_loader/builtin/main.c@@ -4,6 +4,12 @@ #include <linux/firmware.h> #include "../firmware.h" +struct builtin_fw { + char *name; + void *data; + unsigned long size; +}; + extern struct builtin_fw __start_builtin_fw[]; extern struct builtin_fw __end_builtin_fw[];
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 9f21a0db715f..7a948739decd 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h@@ -21,12 +21,6 @@ struct module; struct device; #ifdef CONFIG_FW_LOADER_BUILTIN -struct builtin_fw { - char *name; - void *data; - unsigned long size; -}; - bool firmware_request_builtin(struct firmware *fw, const char *name); #else static inline bool firmware_request_builtin(struct firmware *fw,
--
2.30.2