[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1370410969-15328-2-git-send-email-ming.lei@canonical.com>
Date: Wed, 5 Jun 2013 13:42:47 +0800
From: Ming Lei <ming.lei@...onical.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: linux-kernel@...r.kernel.org, Ming Lei <ming.lei@...onical.com>
Subject: [PATCH 1/3] firmware loader: don't export cache_firmware and uncache_firmware
Looks no drivers have the explict requirement for the two, just don't
export them anymore.
Signed-off-by: Ming Lei <ming.lei@...onical.com>
---
drivers/base/firmware_class.c | 6 ++----
include/linux/firmware.h | 11 -----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index c31fc29..34d47e3 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1240,7 +1240,7 @@ EXPORT_SYMBOL(request_firmware_nowait);
* Return !0 otherwise
*
*/
-int cache_firmware(const char *fw_name)
+static int cache_firmware(const char *fw_name)
{
int ret;
const struct firmware *fw;
@@ -1255,7 +1255,6 @@ int cache_firmware(const char *fw_name)
return ret;
}
-EXPORT_SYMBOL_GPL(cache_firmware);
/**
* uncache_firmware - remove one cached firmware image
@@ -1268,7 +1267,7 @@ EXPORT_SYMBOL_GPL(cache_firmware);
* Return !0 otherwise
*
*/
-int uncache_firmware(const char *fw_name)
+static int uncache_firmware(const char *fw_name)
{
struct firmware_buf *buf;
struct firmware fw;
@@ -1286,7 +1285,6 @@ int uncache_firmware(const char *fw_name)
return -EINVAL;
}
-EXPORT_SYMBOL_GPL(uncache_firmware);
#ifdef CONFIG_PM_SLEEP
static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain);
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index e4279fe..e154c10 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -47,8 +47,6 @@ int request_firmware_nowait(
void (*cont)(const struct firmware *fw, void *context));
void release_firmware(const struct firmware *fw);
-int cache_firmware(const char *name);
-int uncache_firmware(const char *name);
#else
static inline int request_firmware(const struct firmware **fw,
const char *name,
@@ -68,15 +66,6 @@ static inline void release_firmware(const struct firmware *fw)
{
}
-static inline int cache_firmware(const char *name)
-{
- return -ENOENT;
-}
-
-static inline int uncache_firmware(const char *name)
-{
- return -EINVAL;
-}
#endif
#endif
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists