From: Daniel Wagner Date: Thu, 17 Nov 2016 10:00:51 +0000 (+0100) Subject: firmware: move fw_state_is_done() into UHM section X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fab82cb3f1e16f22a1910d380ef572e6fe0e9da9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Daniel Wagner Acked-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman --- 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) \