diff options
| author | Ming Lei <ming.lei@canonical.com> | 2013-06-06 19:52:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-06 12:22:28 -0700 |
| commit | 5b7cb7a1289b77b942e0833c57d76287878315c2 (patch) | |
| tree | bab3cc81f098dde9e3fe1cd23e5f6c3d910c32cb /drivers/base/firmware_class.c | |
| parent | ddf1f0648e8cd6d2208b1d3bfabd6501f5a9407f (diff) | |
| download | lwn-5b7cb7a1289b77b942e0833c57d76287878315c2.tar.gz lwn-5b7cb7a1289b77b942e0833c57d76287878315c2.zip | |
firmware loader: fix compile warning
The commit ddf1f0648e8c("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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index c31fc295500a..47e3a228072d 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -917,6 +917,7 @@ static int fw_load_from_user_helper(struct firmware *firmware, return _request_firmware_load(fw_priv, uevent, timeout); } +#ifdef CONFIG_PM_SLEEP /* kill pending requests without uevent to avoid blocking suspend */ static void kill_requests_without_uevent(void) { @@ -930,6 +931,7 @@ static void kill_requests_without_uevent(void) } mutex_unlock(&fw_lock); } +#endif #else /* CONFIG_FW_LOADER_USER_HELPER */ static inline int @@ -943,7 +945,9 @@ fw_load_from_user_helper(struct firmware *firmware, const char *name, /* No abort during direct loading */ #define is_fw_load_aborted(buf) false +#ifdef CONFIG_PM_SLEEP static inline void kill_requests_without_uevent(void) { } +#endif #endif /* CONFIG_FW_LOADER_USER_HELPER */ |