diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2016-11-17 11:00:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-29 21:28:54 +0100 |
| commit | fab82cb3f1e16f22a1910d380ef572e6fe0e9da9 (patch) | |
| tree | c631aa32ff548df1b0a7f0f41088172f2be5de92 /drivers/base/firmware_class.c | |
| parent | 5b029624948d6864053166da1263df74c0c443df (diff) | |
firmware: move fw_state_is_done() into UHM section
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>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 95f566c10a55..f8ef983c8a0f 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -122,11 +122,6 @@ static void fw_state_init(struct fw_state *fw_st) 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) { 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) #define fw_state_done(fw_st) \ __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) \ __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 */ +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) \ __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) \ __fw_state_check(fw_st, FW_STATUS_LOADING) #define fw_state_is_aborted(fw_st) \ |