Skip to content

Commit e2e2c0f

Browse files
mcgrofgregkh
authored andcommitted
firmware_loader: move struct builtin_fw to the only place used
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@suse.de> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Link: https://lore.kernel.org/r/20211021155843.1969401-5-mcgrof@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9d48960 commit e2e2c0f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/base/firmware_loader/builtin/main.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
/* Only if FW_LOADER=y */
88
#ifdef CONFIG_FW_LOADER
99

10+
struct builtin_fw {
11+
char *name;
12+
void *data;
13+
unsigned long size;
14+
};
15+
1016
extern struct builtin_fw __start_builtin_fw[];
1117
extern struct builtin_fw __end_builtin_fw[];
1218

include/linux/firmware.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ struct device;
2525
* FW_LOADER=m
2626
*/
2727
#ifdef CONFIG_FW_LOADER
28-
struct builtin_fw {
29-
char *name;
30-
void *data;
31-
unsigned long size;
32-
};
33-
3428
bool firmware_request_builtin(struct firmware *fw, const char *name);
3529
#else
3630
static inline bool firmware_request_builtin(struct firmware *fw,

0 commit comments

Comments
 (0)