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

Groups > linux.kernel > #1634248

[PATCH v2 1/6] firmware: move kill_requests_without_uevent() up above

Show all headers | View raw

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>
---
 drivers/base/firmware_class.c | 32 ++++++++++++++++----------------
 1 file 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,
-- 
2.11.0

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

Thread

[PATCH v2 0/6] firmware: move UMH locks onto fallback code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 4/6] firmware: add sanity check on shutdown/suspend "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 5/6] firmware: move assign_firmware_buf() further up "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 3/6] firmware: always enable the reboot notifier "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 1/6] firmware: move kill_requests_without_uevent() up above "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 2/6] firmware: share fw fallback killing on reboot/suspend "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200
  [PATCH v2 6/6] firmware: move umh try locks into the umh code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2017-05-02 10:40 +0200

csiph-web