From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754712AbcIIMNI (ORCPT ); Fri, 9 Sep 2016 08:13:08 -0400 Received: from atlantic540.startdedicated.de ([188.138.9.77]:58636 "EHLO atlantic540.startdedicated.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753592AbcIIMMx (ORCPT ); Fri, 9 Sep 2016 08:12:53 -0400 From: Daniel Wagner To: linux-kernel@vger.kernel.org Cc: Ming Lei , "Luis R . Rodriguez" , Greg Kroah-Hartman , "Srivatsa S . Bhat" , "Rafael J . Wysocki" , Daniel Vetter , Takashi Iwai , Bjorn Andersson , Arend van Spriel , Daniel Wagner Subject: [PATCH v5 4/5] firmware: drop bit ops in favor of simple state machine Date: Fri, 9 Sep 2016 14:12:23 +0200 Message-Id: <1473423144-21734-5-git-send-email-wagi@monom.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473423144-21734-1-git-send-email-wagi@monom.org> References: <1473423144-21734-1-git-send-email-wagi@monom.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Wagner We track the state of the loading with bit ops. Since the state machine has only a couple of states and they are all mutual exclusive there are only a few simple state transition we can model this simplify. UNKNOWN -> LOADING -> DONE | ABORTED Cc: Ming Lei Cc: Luis R. Rodriguez Cc: Greg Kroah-Hartman Signed-off-by: Daniel Wagner --- drivers/base/firmware_class.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 5e38c27..8f5838c 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -109,7 +109,7 @@ enum { struct fw_umh { struct completion completion; - unsigned long status; + u8 status; }; static void fw_umh_init(struct fw_umh *fw_umh) @@ -120,7 +120,7 @@ static void fw_umh_init(struct fw_umh *fw_umh) static int __fw_umh_check(struct fw_umh *fw_umh, unsigned long status) { - return test_bit(status, &fw_umh->status); + return fw_umh->status == status; } static int fw_umh_wait_timeout(struct fw_umh *fw_umh, long timeout) @@ -129,7 +129,7 @@ static int fw_umh_wait_timeout(struct fw_umh *fw_umh, long timeout) ret = wait_for_completion_interruptible_timeout(&fw_umh->completion, timeout); - if (ret != 0 && test_bit(FW_UMH_ABORTED, &fw_umh->status)) + if (ret != 0 && READ_ONCE(fw_umh->status) == FW_UMH_ABORTED) return -ENOENT; return ret; @@ -138,12 +138,10 @@ static int fw_umh_wait_timeout(struct fw_umh *fw_umh, long timeout) static void __fw_umh_set(struct fw_umh *fw_umh, unsigned long status) { - set_bit(status, &fw_umh->status); + WRITE_ONCE(fw_umh->status, status); - if (status == FW_UMH_DONE || status == FW_UMH_ABORTED) { - clear_bit(FW_UMH_LOADING, &fw_umh->status); + if (status == FW_UMH_DONE || status == FW_UMH_ABORTED) complete_all(&fw_umh->completion); - } } #define fw_umh_start(fw_umh) \ -- 2.7.4