GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

firmware: move fw_state_is_done() into UHM section

Browse source 
fw_state_is_done() is only used for UHM so moved into that section.

Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daniel Wagner 2016-11-17 11:00:51 +01:00 • committed by Greg Kroah-Hartman
parent 5b02962494
commit fab82cb3f1
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/base/firmware_class.c
View file

@ -122,11 +122,6 @@ static void fw_state_init(struct fw_state *fw_st)
fw_st->status = FW_STATUS_UNKNOWN; fw_st->status = FW_STATUS_UNKNOWN;
} }
static int __fw_state_check(struct fw_state *fw_st, enum fw_status status)
{
return fw_st->status == status;
}
static inline bool __fw_state_is_done(enum fw_status status) static inline bool __fw_state_is_done(enum fw_status status)
{ {
return status == FW_STATUS_DONE || status == FW_STATUS_ABORTED; return status == FW_STATUS_DONE || status == FW_STATUS_ABORTED;
@ -158,8 +153,6 @@ static void __fw_state_set(struct fw_state *fw_st,
__fw_state_set(fw_st, FW_STATUS_LOADING) __fw_state_set(fw_st, FW_STATUS_LOADING)
#define fw_state_done(fw_st) \ #define fw_state_done(fw_st) \
__fw_state_set(fw_st, FW_STATUS_DONE) __fw_state_set(fw_st, FW_STATUS_DONE)
#define fw_state_is_done(fw_st) \
__fw_state_check(fw_st, FW_STATUS_DONE)
#define fw_state_wait(fw_st) \ #define fw_state_wait(fw_st) \
__fw_state_wait_common(fw_st, MAX_SCHEDULE_TIMEOUT) __fw_state_wait_common(fw_st, MAX_SCHEDULE_TIMEOUT)
@ -169,8 +162,15 @@ static void __fw_state_set(struct fw_state *fw_st,
#else /* CONFIG_FW_LOADER_USER_HELPER */ #else /* CONFIG_FW_LOADER_USER_HELPER */
static int __fw_state_check(struct fw_state *fw_st, enum fw_status status)
{
return fw_st->status == status;
}
#define fw_state_aborted(fw_st) \ #define fw_state_aborted(fw_st) \
__fw_state_set(fw_st, FW_STATUS_ABORTED) __fw_state_set(fw_st, FW_STATUS_ABORTED)
#define fw_state_is_done(fw_st) \
__fw_state_check(fw_st, FW_STATUS_DONE)
#define fw_state_is_loading(fw_st) \ #define fw_state_is_loading(fw_st) \
__fw_state_check(fw_st, FW_STATUS_LOADING) __fw_state_check(fw_st, FW_STATUS_LOADING)
#define fw_state_is_aborted(fw_st) \ #define fw_state_is_aborted(fw_st) \