diff options
Diffstat (limited to 'drivers/base/firmware_loader/fallback.h')
-rw-r--r-- | drivers/base/firmware_loader/fallback.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h index f8255670a663..21063503e4ea 100644 --- a/drivers/base/firmware_loader/fallback.h +++ b/drivers/base/firmware_loader/fallback.h | |||
@@ -5,6 +5,8 @@ | |||
5 | #include <linux/firmware.h> | 5 | #include <linux/firmware.h> |
6 | #include <linux/device.h> | 6 | #include <linux/device.h> |
7 | 7 | ||
8 | #include "firmware.h" | ||
9 | |||
8 | /** | 10 | /** |
9 | * struct firmware_fallback_config - firmware fallback configuration settings | 11 | * struct firmware_fallback_config - firmware fallback configuration settings |
10 | * | 12 | * |
@@ -29,10 +31,10 @@ struct firmware_fallback_config { | |||
29 | }; | 31 | }; |
30 | 32 | ||
31 | #ifdef CONFIG_FW_LOADER_USER_HELPER | 33 | #ifdef CONFIG_FW_LOADER_USER_HELPER |
32 | int fw_sysfs_fallback(struct firmware *fw, const char *name, | 34 | int firmware_fallback_sysfs(struct firmware *fw, const char *name, |
33 | struct device *device, | 35 | struct device *device, |
34 | unsigned int opt_flags, | 36 | enum fw_opt opt_flags, |
35 | int ret); | 37 | int ret); |
36 | void kill_pending_fw_fallback_reqs(bool only_kill_custom); | 38 | void kill_pending_fw_fallback_reqs(bool only_kill_custom); |
37 | 39 | ||
38 | void fw_fallback_set_cache_timeout(void); | 40 | void fw_fallback_set_cache_timeout(void); |
@@ -41,10 +43,10 @@ void fw_fallback_set_default_timeout(void); | |||
41 | int register_sysfs_loader(void); | 43 | int register_sysfs_loader(void); |
42 | void unregister_sysfs_loader(void); | 44 | void unregister_sysfs_loader(void); |
43 | #else /* CONFIG_FW_LOADER_USER_HELPER */ | 45 | #else /* CONFIG_FW_LOADER_USER_HELPER */ |
44 | static inline int fw_sysfs_fallback(struct firmware *fw, const char *name, | 46 | static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name, |
45 | struct device *device, | 47 | struct device *device, |
46 | unsigned int opt_flags, | 48 | enum fw_opt opt_flags, |
47 | int ret) | 49 | int ret) |
48 | { | 50 | { |
49 | /* Keep carrying over the same error */ | 51 | /* Keep carrying over the same error */ |
50 | return ret; | 52 | return ret; |