Commit e2e2c0f2 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Greg Kroah-Hartman
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211021155843.1969401-5-mcgrof@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d489604

drivers/base/firmware_loader/builtin/main.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,12 @@ 
/* Only if FW_LOADER=y */

/* Only if FW_LOADER=y */

#ifdef CONFIG_FW_LOADER

#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 __start_builtin_fw[];

extern struct builtin_fw __end_builtin_fw[];

extern struct builtin_fw __end_builtin_fw[];

include/linux/firmware.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -25,12 +25,6 @@ struct device; 
 * FW_LOADER=m

 * FW_LOADER=m

 */

 */

#ifdef CONFIG_FW_LOADER

#ifdef CONFIG_FW_LOADER

struct builtin_fw {

	char *name;

	void *data;

	unsigned long size;

};



bool firmware_request_builtin(struct firmware *fw, const char *name);

bool firmware_request_builtin(struct firmware *fw, const char *name);

#else

#else

static inline bool firmware_request_builtin(struct firmware *fw,

static inline bool firmware_request_builtin(struct firmware *fw,