From: Ming Lei <ming.lei@canonical.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Ming Lei <ming.lei@canonical.com>
Subject: [PATCH v1 1/4] firmware loader: don't export cache_firmware and uncache_firmware
Date: Thu, 6 Jun 2013 20:01:47 +0800 [thread overview]
Message-ID: <1370520110-32293-2-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1370520110-32293-1-git-send-email-ming.lei@canonical.com>
Looks no driver has the explict requirement for the two exported
API, just don't export them anymore.
Signed-off-by: Ming Lei <ming.lei@canonical.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 47e3a22..caaddef 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1244,7 +1244,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;
@@ -1259,7 +1259,6 @@ int cache_firmware(const char *fw_name)
return ret;
}
-EXPORT_SYMBOL_GPL(cache_firmware);
/**
* uncache_firmware - remove one cached firmware image
@@ -1272,7 +1271,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;
@@ -1290,7 +1289,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
next prev parent reply other threads:[~2013-06-06 12:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 12:01 [PATCH v1 0/4] firmware loader: cleanup and introduce search paths option Ming Lei
2013-06-06 12:01 ` Ming Lei [this message]
2013-06-06 12:01 ` [PATCH v1 2/4] firmware loader: simplify holding module for request_firmware Ming Lei
2014-01-07 7:56 ` Dmitry Torokhov
2014-01-07 14:53 ` Ming Lei
2014-01-07 17:23 ` Dmitry Torokhov
2013-06-06 12:01 ` [PATCH v1 3/4] firmware loader: allow distribution to choose default search paths Ming Lei
2013-06-06 19:47 ` Greg Kroah-Hartman
2013-06-07 1:24 ` Ming Lei
2013-06-07 4:20 ` Greg Kroah-Hartman
2013-06-07 15:01 ` Ming Lei
2013-06-06 12:01 ` [RFC PATCH v1 4/4] firmware loader: don't allow to request firmware via relative path Ming Lei
2013-06-06 19:48 ` Greg Kroah-Hartman
2013-06-07 1:30 ` Ming Lei
2013-06-07 4:21 ` Greg Kroah-Hartman
2013-06-07 6:04 ` Takashi Iwai
2013-06-07 14:54 ` Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370520110-32293-2-git-send-email-ming.lei@canonical.com \
--to=ming.lei@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox