Commit 5b7cb7a1 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman

firmware loader: fix compile warning

The commit ddf1f064("firmware loader: fix build failure
with !CONFIG_FW_LOADER_USER_HELPER") introduces the below
warning:

drivers/base/firmware_class.c:921:13: warning:
'kill_requests_without_uevent' defined but not used [-Wunused-function]

So fix it by defining kill_requests_without_uevent() only if
CONFIG_PM_SLEEP is set.
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ddf1f064
...@@ -917,6 +917,7 @@ static int fw_load_from_user_helper(struct firmware *firmware, ...@@ -917,6 +917,7 @@ static int fw_load_from_user_helper(struct firmware *firmware,
return _request_firmware_load(fw_priv, uevent, timeout); return _request_firmware_load(fw_priv, uevent, timeout);
} }
#ifdef CONFIG_PM_SLEEP
/* kill pending requests without uevent to avoid blocking suspend */ /* kill pending requests without uevent to avoid blocking suspend */
static void kill_requests_without_uevent(void) static void kill_requests_without_uevent(void)
{ {
...@@ -930,6 +931,7 @@ static void kill_requests_without_uevent(void) ...@@ -930,6 +931,7 @@ static void kill_requests_without_uevent(void)
} }
mutex_unlock(&fw_lock); mutex_unlock(&fw_lock);
} }
#endif
#else /* CONFIG_FW_LOADER_USER_HELPER */ #else /* CONFIG_FW_LOADER_USER_HELPER */
static inline int static inline int
...@@ -943,7 +945,9 @@ fw_load_from_user_helper(struct firmware *firmware, const char *name, ...@@ -943,7 +945,9 @@ fw_load_from_user_helper(struct firmware *firmware, const char *name,
/* No abort during direct loading */ /* No abort during direct loading */
#define is_fw_load_aborted(buf) false #define is_fw_load_aborted(buf) false
#ifdef CONFIG_PM_SLEEP
static inline void kill_requests_without_uevent(void) { } static inline void kill_requests_without_uevent(void) { }
#endif
#endif /* CONFIG_FW_LOADER_USER_HELPER */ #endif /* CONFIG_FW_LOADER_USER_HELPER */
......
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