From: Luis Chamberlain <mcgrof@xxxxxxxxxx>
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 <bp@xxxxxxx>
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
---
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 d85626b2fdf5..a065c3150897 100644
--- a/drivers/base/firmware_loader/builtin/main.c
+++ b/drivers/base/firmware_loader/builtin/main.c
@@ -7,6 +7,12 @@
/* Only if FW_LOADER=y */
#ifdef CONFIG_FW_LOADER
+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 34e8d5844fa0..3b057dfc8284 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -25,12 +25,6 @@ struct device;
* FW_LOADER=m
*/
#ifdef CONFIG_FW_LOADER
-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
