From: Mukesh Ojha <quic_mojha@quicinc.com>
To: <mcgrof@kernel.org>, <russ.weight@linux.dev>,
<gregkh@linuxfoundation.org>, <rafael@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, Mukesh Ojha <quic_mojha@quicinc.com>
Subject: [PATCH vRFC 7/8] firmware: remove prototype of fw_cache_piggyback_on_request()
Date: Thu, 22 Feb 2024 23:30:32 +0530 [thread overview]
Message-ID: <20240222180033.23775-8-quic_mojha@quicinc.com> (raw)
In-Reply-To: <20240222180033.23775-1-quic_mojha@quicinc.com>
We should always try to avoid using prototype of a static
function like fw_cache_piggyback_on_request() firmware
main file. Move the relevant code in such a way that avoid
the prototype usage.
Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
---
drivers/base/firmware_loader/main.c | 109 ++++++++++++++--------------
1 file changed, 54 insertions(+), 55 deletions(-)
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 1d752965d311..91a45767a3a7 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -100,8 +100,6 @@ static inline int fw_state_wait(struct fw_priv *fw_priv)
return __fw_state_wait_common(fw_priv, MAX_SCHEDULE_TIMEOUT);
}
-static void fw_cache_piggyback_on_request(struct fw_priv *fw_priv);
-
static struct fw_priv *__allocate_fw_priv(const char *fw_name,
struct firmware_cache *fwc,
void *dbuf,
@@ -672,7 +670,61 @@ static int fw_add_devm_name(struct device *dev, const char *name)
return 0;
}
+
+static struct fw_cache_entry *alloc_fw_cache_entry(const char *name)
+{
+ struct fw_cache_entry *fce;
+
+ fce = kzalloc(sizeof(*fce), GFP_ATOMIC);
+ if (!fce)
+ goto exit;
+
+ fce->name = kstrdup_const(name, GFP_ATOMIC);
+ if (!fce->name) {
+ kfree(fce);
+ fce = NULL;
+ goto exit;
+ }
+exit:
+ return fce;
+}
+
+static int __fw_entry_found(const char *name)
+{
+ struct firmware_cache *fwc = &fw_cache;
+ struct fw_cache_entry *fce;
+
+ list_for_each_entry(fce, &fwc->fw_names, list) {
+ if (!strcmp(fce->name, name))
+ return 1;
+ }
+ return 0;
+}
+
+static void fw_cache_piggyback_on_request(struct fw_priv *fw_priv)
+{
+ const char *name = fw_priv->fw_name;
+ struct firmware_cache *fwc = fw_priv->fwc;
+ struct fw_cache_entry *fce;
+
+ spin_lock(&fwc->name_lock);
+ if (__fw_entry_found(name))
+ goto found;
+
+ fce = alloc_fw_cache_entry(name);
+ if (fce) {
+ list_add(&fce->list, &fwc->fw_names);
+ kref_get(&fw_priv->ref);
+ pr_debug("%s: fw: %s\n", __func__, name);
+ }
+found:
+ spin_unlock(&fwc->name_lock);
+}
+
#else
+static void fw_cache_piggyback_on_request(struct fw_priv *fw_priv)
+{
+}
static bool fw_cache_is_setup(struct device *dev, const char *name)
{
return false;
@@ -1285,56 +1337,6 @@ static int uncache_firmware(const char *fw_name)
return -EINVAL;
}
-static struct fw_cache_entry *alloc_fw_cache_entry(const char *name)
-{
- struct fw_cache_entry *fce;
-
- fce = kzalloc(sizeof(*fce), GFP_ATOMIC);
- if (!fce)
- goto exit;
-
- fce->name = kstrdup_const(name, GFP_ATOMIC);
- if (!fce->name) {
- kfree(fce);
- fce = NULL;
- goto exit;
- }
-exit:
- return fce;
-}
-
-static int __fw_entry_found(const char *name)
-{
- struct firmware_cache *fwc = &fw_cache;
- struct fw_cache_entry *fce;
-
- list_for_each_entry(fce, &fwc->fw_names, list) {
- if (!strcmp(fce->name, name))
- return 1;
- }
- return 0;
-}
-
-static void fw_cache_piggyback_on_request(struct fw_priv *fw_priv)
-{
- const char *name = fw_priv->fw_name;
- struct firmware_cache *fwc = fw_priv->fwc;
- struct fw_cache_entry *fce;
-
- spin_lock(&fwc->name_lock);
- if (__fw_entry_found(name))
- goto found;
-
- fce = alloc_fw_cache_entry(name);
- if (fce) {
- list_add(&fce->list, &fwc->fw_names);
- kref_get(&fw_priv->ref);
- pr_debug("%s: fw: %s\n", __func__, name);
- }
-found:
- spin_unlock(&fwc->name_lock);
-}
-
static void free_fw_cache_entry(struct fw_cache_entry *fce)
{
kfree_const(fce->name);
@@ -1563,9 +1565,6 @@ static inline void unregister_fw_pm_ops(void)
unregister_pm_notifier(&fw_cache.pm_notify);
}
#else
-static void fw_cache_piggyback_on_request(struct fw_priv *fw_priv)
-{
-}
static inline int register_fw_pm_ops(void)
{
return 0;
--
2.43.0.254.ga26002b62827
next prev parent reply other threads:[~2024-02-22 18:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 18:00 [PATCH vRFC 0/8] Refactor and rename request firmware API Mukesh Ojha
2024-02-22 18:00 ` [PATCH vRFC 1/8] firmware_loader: Refactor request firmware lower level functions Mukesh Ojha
2024-02-22 18:00 ` [PATCH vRFC 2/8] treewide: rename firmware_request_nowarn() Mukesh Ojha
2024-02-22 18:00 ` [PATCH vRFC 3/8] treewide: rename firmware_request_platform() Mukesh Ojha
2024-02-23 6:21 ` Greg KH
2024-02-23 15:15 ` Luis Chamberlain
2024-02-23 15:33 ` Greg KH
2024-02-23 19:42 ` Luis Chamberlain
2024-02-24 5:36 ` Greg KH
2024-02-26 10:52 ` Mukesh Ojha
2024-02-26 13:09 ` Greg KH
2024-02-26 13:22 ` Mukesh Ojha
2024-02-26 16:06 ` Luis Chamberlain
2024-02-22 18:00 ` [PATCH vRFC 4/8] treewide: rename firmware_request_cache() Mukesh Ojha
2024-02-22 18:00 ` [PATCH vRFC 5/8] firmware: Convert minor inline function to macro Mukesh Ojha
2024-02-23 6:22 ` Greg KH
2024-02-22 18:00 ` [PATCH vRFC 6/8] firmware: Move module template to the bottom Mukesh Ojha
2024-02-22 18:00 ` Mukesh Ojha [this message]
2024-02-22 18:00 ` [PATCH vRFC 8/8] firmware: FW_OPT_UEVENT for all request_firmware family functions Mukesh Ojha
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=20240222180033.23775-8-quic_mojha@quicinc.com \
--to=quic_mojha@quicinc.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=rafael@kernel.org \
--cc=russ.weight@linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).