lkml.org 
[lkml]   [2021]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 08/14] firmware_loader: move struct builtin_fw to the only place used
Date
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 <bp@suse.de>
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
\
 
 \ /
  Last update: 2021-09-17 20:25    [W:0.497 / U:0.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site