From: "Luis R. Rodriguez" <mcgrof@kernel•org>
To: gregkh@linuxfoundation•org
Cc: akpm@linux-foundation•org, keescook@chromium•org,
josh@joshtriplett•org, teg@jklm•no, wagi@monom•org,
hdegoede@redhat•com, andresx7@gmail•com,
zohar@linux•vnet.ibm.com, kubakici@wp•pl, shuah@kernel•org,
mfuzzey@parkeon•com, dhowells@redhat•com, pali.rohar@gmail•com,
tiwai@suse•de, kvalo@codeaurora•org,
arend.vanspriel@broadcom•com, zajec5@gmail•com, nbroeking@me•com,
markivx@codeaurora•org, broonie@kernel•org,
dmitry.torokhov@gmail•com, dwmw2@infradead•org,
torvalds@linux-foundation•org, Abhay_Salunke@dell•com,
bjorn.andersson@linaro•org, jewalt@lgsinnovations•com,
oneukum@suse•com, cantabile.desu@gmail•com, ast@fb•com,
hare@suse•com, jejb@linux•vnet.ibm.com,
martin.petersen@oracle•com, khc@pm•waw.pl, davem@davemloft•net,
maco@android•com, arve@android•com, tkjos@android•com, linux
Subject: [PATCH v5 3/6] firmware: rename fw_sysfs_fallback to firmware_fallback_sysfs()
Date: Fri, 4 May 2018 10:43:52 -0700 [thread overview]
Message-ID: <20180504174356.13227-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20180504174356.13227-1-mcgrof@kernel.org>
From: Andres Rodriguez <andresx7@gmail•com>
This is done since this call is now exposed through kernel-doc,
and since this also paves the way for different future types of
fallback mechanims.
Signed-off-by: Andres Rodriguez <andresx7@gmail•com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel•org>
[mcgrof: small coding style changes]
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel•org>
---
drivers/base/firmware_loader/fallback.c | 8 ++++----
drivers/base/firmware_loader/fallback.h | 16 ++++++++--------
drivers/base/firmware_loader/firmware.h | 2 +-
drivers/base/firmware_loader/main.c | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c
index 529f7013616f..3db9e0f225ac 100644
--- a/drivers/base/firmware_loader/fallback.c
+++ b/drivers/base/firmware_loader/fallback.c
@@ -662,10 +662,10 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags)
return fw_force_sysfs_fallback(opt_flags);
}
-int fw_sysfs_fallback(struct firmware *fw, const char *name,
- struct device *device,
- enum fw_opt opt_flags,
- int ret)
+int firmware_fallback_sysfs(struct firmware *fw, const char *name,
+ struct device *device,
+ enum fw_opt opt_flags,
+ int ret)
{
if (!fw_run_sysfs_fallback(opt_flags))
return ret;
diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h
index a3b73a09db6c..21063503e4ea 100644
--- a/drivers/base/firmware_loader/fallback.h
+++ b/drivers/base/firmware_loader/fallback.h
@@ -31,10 +31,10 @@ struct firmware_fallback_config {
};
#ifdef CONFIG_FW_LOADER_USER_HELPER
-int fw_sysfs_fallback(struct firmware *fw, const char *name,
- struct device *device,
- enum fw_opt opt_flags,
- int ret);
+int firmware_fallback_sysfs(struct firmware *fw, const char *name,
+ struct device *device,
+ enum fw_opt opt_flags,
+ int ret);
void kill_pending_fw_fallback_reqs(bool only_kill_custom);
void fw_fallback_set_cache_timeout(void);
@@ -43,10 +43,10 @@ void fw_fallback_set_default_timeout(void);
int register_sysfs_loader(void);
void unregister_sysfs_loader(void);
#else /* CONFIG_FW_LOADER_USER_HELPER */
-static inline int fw_sysfs_fallback(struct firmware *fw, const char *name,
- struct device *device,
- enum fw_opt opt_flags,
- int ret)
+static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name,
+ struct device *device,
+ enum fw_opt opt_flags,
+ int ret)
{
/* Keep carrying over the same error */
return ret;
diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h
index 4f433b447367..4c1395f8e7ed 100644
--- a/drivers/base/firmware_loader/firmware.h
+++ b/drivers/base/firmware_loader/firmware.h
@@ -20,7 +20,7 @@
* @FW_OPT_NOWAIT: Used to describe the firmware request is asynchronous.
* @FW_OPT_USERHELPER: Enable the fallback mechanism, in case the direct
* filesystem lookup fails at finding the firmware. For details refer to
- * fw_sysfs_fallback().
+ * firmware_fallback_sysfs().
* @FW_OPT_NO_WARN: Quiet, avoid printing warning messages.
* @FW_OPT_NOCACHE: Disables firmware caching. Firmware caching is used to
* cache the firmware upon suspend, so that upon resume races against the
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 7f2bc7e8e3c0..d951af29017a 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -581,7 +581,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
dev_warn(device,
"Direct firmware load for %s failed with error %d\n",
name, ret);
- ret = fw_sysfs_fallback(fw, name, device, opt_flags, ret);
+ ret = firmware_fallback_sysfs(fw, name, device, opt_flags, ret);
} else
ret = assign_fw(fw, device, opt_flags);
--
2.17.0
next prev parent reply other threads:[~2018-05-04 17:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-04 17:43 [PATCH v5 0/6] firmware_loader: cleanups for v4.18 Luis R. Rodriguez
2018-05-04 17:43 ` [PATCH v5 1/6] firmware: wrap FW_OPT_* into an enum Luis R. Rodriguez
2018-05-04 17:43 ` [PATCH v5 2/6] firmware: use () to terminate kernel-doc function names Luis R. Rodriguez
2018-05-04 17:43 ` Luis R. Rodriguez [this message]
2018-05-04 17:43 ` [PATCH v5 4/6] firmware_loader: document firmware_sysfs_fallback() Luis R. Rodriguez
2018-05-04 17:43 ` [PATCH v5 5/6] firmware_loader: enhance Kconfig documentation over FW_LOADER Luis R. Rodriguez
2018-05-04 17:43 ` [PATCH v5 6/6] firmware_loader: move kconfig FW_LOADER entries to its own file Luis R. Rodriguez
2018-05-04 19:17 ` [PATCH v5 0/6] firmware_loader: cleanups for v4.18 Krzysztof Halasa
2018-05-04 19:58 ` Luis R. Rodriguez
2018-05-05 20:26 ` Krzysztof Halasa
2018-05-08 15:24 ` Luis R. Rodriguez
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=20180504174356.13227-4-mcgrof@kernel.org \
--to=mcgrof@kernel$(echo .)org \
--cc=Abhay_Salunke@dell$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andresx7@gmail$(echo .)com \
--cc=arend.vanspriel@broadcom$(echo .)com \
--cc=arve@android$(echo .)com \
--cc=ast@fb$(echo .)com \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=cantabile.desu@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dhowells@redhat$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=dwmw2@infradead$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hare@suse$(echo .)com \
--cc=hdegoede@redhat$(echo .)com \
--cc=jejb@linux$(echo .)vnet.ibm.com \
--cc=jewalt@lgsinnovations$(echo .)com \
--cc=josh@joshtriplett$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=khc@pm$(echo .)waw.pl \
--cc=kubakici@wp$(echo .)pl \
--cc=kvalo@codeaurora$(echo .)org \
--cc=maco@android$(echo .)com \
--cc=markivx@codeaurora$(echo .)org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=mfuzzey@parkeon$(echo .)com \
--cc=nbroeking@me$(echo .)com \
--cc=oneukum@suse$(echo .)com \
--cc=pali.rohar@gmail$(echo .)com \
--cc=shuah@kernel$(echo .)org \
--cc=teg@jklm$(echo .)no \
--cc=tiwai@suse$(echo .)de \
--cc=tkjos@android$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=wagi@monom$(echo .)org \
--cc=zajec5@gmail$(echo .)com \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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