Commit 5275d194 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Mimi Zohar

firmware: move completing fw into a helper

This will be re-used later through a new extensible interface.
Reviewed-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
parent ed04630b
...@@ -322,6 +322,15 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) ...@@ -322,6 +322,15 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf)
return rc; 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, static int fw_get_filesystem_firmware(struct device *device,
struct firmware_buf *buf) struct firmware_buf *buf)
{ {
...@@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device, ...@@ -363,10 +372,7 @@ static int fw_get_filesystem_firmware(struct device *device,
if (!rc) { if (!rc) {
dev_dbg(device, "direct-loading %s\n", dev_dbg(device, "direct-loading %s\n",
buf->fw_id); buf->fw_id);
mutex_lock(&fw_lock); fw_finish_direct_load(device, buf);
set_bit(FW_STATUS_DONE, &buf->status);
complete_all(&buf->completion);
mutex_unlock(&fw_lock);
} }
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment