Instead of having multiple #ifdef CONFIG_FIRMWARE in a single file move the code together inside a single #ifdef.
Signed-off-by: Sascha Hauer <[email protected]> --- include/firmware.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/firmware.h b/include/firmware.h index 4e69412832..f09a64e7ed 100644 --- a/include/firmware.h +++ b/include/firmware.h @@ -28,24 +28,21 @@ int firmwaremgr_register(struct firmware_handler *); struct firmware_mgr *firmwaremgr_find(const char *); #ifdef CONFIG_FIRMWARE struct firmware_mgr *firmwaremgr_find_by_node(struct device_node *np); +int firmwaremgr_load_file(struct firmware_mgr *, const char *path); #else static inline struct firmware_mgr *firmwaremgr_find_by_node(struct device_node *np) { return NULL; } -#endif -void firmwaremgr_list_handlers(void); - -#ifdef CONFIG_FIRMWARE -int firmwaremgr_load_file(struct firmware_mgr *, const char *path); -#else static inline int firmwaremgr_load_file(struct firmware_mgr *mgr, const char *path) { return -ENOSYS; } #endif +void firmwaremgr_list_handlers(void); + #define get_builtin_firmware(name, start, size) \ { \ extern char _fw_##name##_start[]; \ -- 2.29.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
