diff options
| author | Luis R. Rodriguez | 2017-05-02 10:31:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-06-03 12:15:49 +0200 |
| commit | 6383331d8f390da68e5cb3e9184b5c99429c4545 (patch) | |
| tree | 6c1533b2a266732d722e8103cdf3dd90ec7d5dad /drivers/base | |
| parent | arm,arm64,drivers: add a prefix to drivers arch_topology interfaces (diff) | |
| download | kernel-qcow2-linux-6383331d8f390da68e5cb3e9184b5c99429c4545.tar.gz kernel-qcow2-linux-6383331d8f390da68e5cb3e9184b5c99429c4545.tar.xz kernel-qcow2-linux-6383331d8f390da68e5cb3e9184b5c99429c4545.zip | |
firmware: move kill_requests_without_uevent() up above
This routine will used in functions declared earlier next. This
code shift has no functional changes, it will make subsequent
changes easier to read.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/firmware_class.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index ac350c518e0c..900b139668e8 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -562,6 +562,22 @@ static void fw_load_abort(struct firmware_priv *fw_priv) static LIST_HEAD(pending_fw_head); +#ifdef CONFIG_PM_SLEEP +/* kill pending requests without uevent to avoid blocking suspend */ +static void kill_requests_without_uevent(void) +{ + struct firmware_buf *buf; + struct firmware_buf *next; + + mutex_lock(&fw_lock); + list_for_each_entry_safe(buf, next, &pending_fw_head, pending_list) { + if (!buf->need_uevent) + __fw_load_abort(buf); + } + mutex_unlock(&fw_lock); +} +#endif + /* reboot notifier for avoid deadlock with usermode_lock */ static int fw_shutdown_notify(struct notifier_block *unused1, unsigned long unused2, void *unused3) @@ -1048,22 +1064,6 @@ static int fw_load_from_user_helper(struct firmware *firmware, return _request_firmware_load(fw_priv, opt_flags, timeout); } -#ifdef CONFIG_PM_SLEEP -/* kill pending requests without uevent to avoid blocking suspend */ -static void kill_requests_without_uevent(void) -{ - struct firmware_buf *buf; - struct firmware_buf *next; - - mutex_lock(&fw_lock); - list_for_each_entry_safe(buf, next, &pending_fw_head, pending_list) { - if (!buf->need_uevent) - __fw_load_abort(buf); - } - mutex_unlock(&fw_lock); -} -#endif - #else /* CONFIG_FW_LOADER_USER_HELPER */ static inline int fw_load_from_user_helper(struct firmware *firmware, const char *name, |