Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1237604

[PATCH v2 2/5] firmware: move completing fw into a helper

Show all headers | View raw

From: "Luis R. Rodriguez" <mcgrof@suse.com>

This will be re-used later through a new extensible interface.

Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
 drivers/base/firmware_class.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 6f5fcda71a60..d8148aa89b01 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -322,6 +322,15 @@ fail:
 	return rc;
 }
 
+static void fw_finish_direct_load(struct device *device,
+				  struct firmware_buf *buf)
+{
+	mutex_lock(&fw_lock);
+	set_bit(FW_STATUS_DONE, &buf->status);
+	complete_all(&buf->completion);
+	mutex_unlock(&fw_lock);
+}
+
 static int fw_get_filesystem_firmware(struct device *device,
 				       struct firmware_buf *buf)
 {
@@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device,
 	if (!rc) {
 		dev_dbg(device, "system data: direct-loading firmware %s\n",
 			buf->fw_id);
-		mutex_lock(&fw_lock);
-		set_bit(FW_STATUS_DONE, &buf->status);
-		complete_all(&buf->completion);
-		mutex_unlock(&fw_lock);
+		fw_finish_direct_load(device, buf);
 	}
 
 	return rc;
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] firmware_class: extensible firmware API "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 19:50 +0200
  [PATCH v2 1/5] firmware: generalize "firmware" as "system data" helpers "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 19:50 +0200
  [PATCH v2 2/5] firmware: move completing fw into a helper "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 20:00 +0200
  [PATCH v2 4/5] firmware: generalize reading file contents as a helper "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 20:00 +0200
  [PATCH v2 5/5] firmware: add an extensible system data helpers "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 20:00 +0200
  [PATCH v2 3/5] firmware: fold successful fw read early "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-10-01 20:00 +0200

csiph-web