From: "Luis R. Rodriguez" <mcgrof@kernel.org> To: Andres Rodriguez <andresx7@gmail.com> Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, mcgrof@kernel.org, alexdeucher@gmail.com, christian.koenig@amd.com, kvalo@codeaurora.org, arend.vanspriel@broadcom.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, hdegoede@redhat.com, Kees Cook <keescook@chromium.org> Subject: Re: [PATCH 7/9] firmware: use rename fw_sysfs_fallback to use the firmware_ prefix Date: Thu, 3 May 2018 23:44:09 +0000 [thread overview] Message-ID: <20180503234409.GY27853@wotan.suse.de> (raw) In-Reply-To: <20180423201205.20533-8-andresx7@gmail.com> On Mon, Apr 23, 2018 at 04:12:03PM -0400, Andres Rodriguez wrote: > Use the correct prefix for symbols exported by firmware_loader(). This > is done since firmware_sysfs_fallback() is now exposed through > kernel-doc. > > Signed-off-by: Andres Rodriguez <andresx7@gmail.com> > --- > drivers/base/firmware_loader/fallback.c | 8 ++++---- > drivers/base/firmware_loader/fallback.h | 4 ++-- > drivers/base/firmware_loader/firmware.h | 6 +++--- > drivers/base/firmware_loader/main.c | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c > index 1a47ddc70c31..fc186b5bccce 100644 > --- a/drivers/base/firmware_loader/fallback.c > +++ b/drivers/base/firmware_loader/fallback.c > @@ -661,10 +661,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_sysfs_fallback(struct firmware *fw, const char *name, > + struct device *device, > + enum fw_opt opt_flags, > + int ret) Since we may get more than one fallback later I'll usee the firmware_fallback_sysfs() here. I'll do this change and resubmit myself. > { > 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..8cfaa3299bb7 100644 > --- a/drivers/base/firmware_loader/fallback.h > +++ b/drivers/base/firmware_loader/fallback.h > @@ -31,7 +31,7 @@ struct firmware_fallback_config { > }; > > #ifdef CONFIG_FW_LOADER_USER_HELPER > -int fw_sysfs_fallback(struct firmware *fw, const char *name, > +int firmware_sysfs_fallback(struct firmware *fw, const char *name, > struct device *device, > enum fw_opt opt_flags, > int ret); > @@ -43,7 +43,7 @@ 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, > +static inline int firmware_sysfs_fallback(struct firmware *fw, const char *name, > struct device *device, > enum fw_opt opt_flags, > int ret) > diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h > index a405d400a925..59836d50c5bd 100644 > --- a/drivers/base/firmware_loader/firmware.h > +++ b/drivers/base/firmware_loader/firmware.h > @@ -15,12 +15,12 @@ > * enum fw_opt - options to control firmware loading behaviour > * > * @FW_OPT_UEVENT: Enables the fallback mechanism to send a kobject uevent > - * when the firmware is not found. Userspace is in charge > - * to load the firmware using the sysfs loading facility. > + * when the firmware is not found. Userspace is in charge > + * to load the firmware using the sysfs loading facility. This change was really not part of this patch, so I'll merge it in with the other patch. > * @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(). > + * For details refer to firmware_sysfs_fallback(). > * @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 > diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c > index 58aaadf81e12..f009566acd35 100644 > --- a/drivers/base/firmware_loader/main.c > +++ b/drivers/base/firmware_loader/main.c > @@ -581,7 +581,7 @@ _firmware_request(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_sysfs_fallback(fw, name, device, opt_flags, ret); > } else > ret = assign_fw(fw, device, opt_flags); > > -- > 2.14.1 > > -- Do not panic
WARNING: multiple messages have this Message-ID (diff)
From: "Luis R. Rodriguez" <mcgrof@kernel.org> To: Andres Rodriguez <andresx7@gmail.com> Cc: arend.vanspriel@broadcom.com, Kees Cook <keescook@chromium.org>, gregkh@linuxfoundation.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, hdegoede@redhat.com, mcgrof@kernel.org, alexdeucher@gmail.com, christian.koenig@amd.com, kvalo@codeaurora.org Subject: Re: [PATCH 7/9] firmware: use rename fw_sysfs_fallback to use the firmware_ prefix Date: Thu, 3 May 2018 23:44:09 +0000 [thread overview] Message-ID: <20180503234409.GY27853@wotan.suse.de> (raw) In-Reply-To: <20180423201205.20533-8-andresx7@gmail.com> On Mon, Apr 23, 2018 at 04:12:03PM -0400, Andres Rodriguez wrote: > Use the correct prefix for symbols exported by firmware_loader(). This > is done since firmware_sysfs_fallback() is now exposed through > kernel-doc. > > Signed-off-by: Andres Rodriguez <andresx7@gmail.com> > --- > drivers/base/firmware_loader/fallback.c | 8 ++++---- > drivers/base/firmware_loader/fallback.h | 4 ++-- > drivers/base/firmware_loader/firmware.h | 6 +++--- > drivers/base/firmware_loader/main.c | 2 +- > 4 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c > index 1a47ddc70c31..fc186b5bccce 100644 > --- a/drivers/base/firmware_loader/fallback.c > +++ b/drivers/base/firmware_loader/fallback.c > @@ -661,10 +661,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_sysfs_fallback(struct firmware *fw, const char *name, > + struct device *device, > + enum fw_opt opt_flags, > + int ret) Since we may get more than one fallback later I'll usee the firmware_fallback_sysfs() here. I'll do this change and resubmit myself. > { > 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..8cfaa3299bb7 100644 > --- a/drivers/base/firmware_loader/fallback.h > +++ b/drivers/base/firmware_loader/fallback.h > @@ -31,7 +31,7 @@ struct firmware_fallback_config { > }; > > #ifdef CONFIG_FW_LOADER_USER_HELPER > -int fw_sysfs_fallback(struct firmware *fw, const char *name, > +int firmware_sysfs_fallback(struct firmware *fw, const char *name, > struct device *device, > enum fw_opt opt_flags, > int ret); > @@ -43,7 +43,7 @@ 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, > +static inline int firmware_sysfs_fallback(struct firmware *fw, const char *name, > struct device *device, > enum fw_opt opt_flags, > int ret) > diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h > index a405d400a925..59836d50c5bd 100644 > --- a/drivers/base/firmware_loader/firmware.h > +++ b/drivers/base/firmware_loader/firmware.h > @@ -15,12 +15,12 @@ > * enum fw_opt - options to control firmware loading behaviour > * > * @FW_OPT_UEVENT: Enables the fallback mechanism to send a kobject uevent > - * when the firmware is not found. Userspace is in charge > - * to load the firmware using the sysfs loading facility. > + * when the firmware is not found. Userspace is in charge > + * to load the firmware using the sysfs loading facility. This change was really not part of this patch, so I'll merge it in with the other patch. > * @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(). > + * For details refer to firmware_sysfs_fallback(). > * @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 > diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c > index 58aaadf81e12..f009566acd35 100644 > --- a/drivers/base/firmware_loader/main.c > +++ b/drivers/base/firmware_loader/main.c > @@ -581,7 +581,7 @@ _firmware_request(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_sysfs_fallback(fw, name, device, opt_flags, ret); > } else > ret = assign_fw(fw, device, opt_flags); > > -- > 2.14.1 > > -- Do not panic _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2018-05-03 23:44 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-23 20:11 [PATCH 0/9] Loading optional firmware v4 Andres Rodriguez 2018-04-23 20:11 ` Andres Rodriguez 2018-04-23 20:11 ` [PATCH 1/9] firmware: some documentation fixes Andres Rodriguez 2018-04-23 20:11 ` Andres Rodriguez 2018-04-25 15:25 ` Greg KH 2018-04-25 15:25 ` Greg KH 2018-04-25 15:26 ` Greg KH 2018-04-25 15:26 ` Greg KH 2018-04-25 16:25 ` [PATCH 1/2] " Andres Rodriguez 2018-04-25 16:25 ` Andres Rodriguez 2018-04-25 16:25 ` [PATCH 2/2] usb: typec: fix formatting errors that cause build breakage Andres Rodriguez 2018-04-25 16:25 ` Andres Rodriguez 2018-04-25 16:35 ` Greg KH 2018-04-25 16:35 ` Greg KH 2018-04-25 16:36 ` [PATCH 1/2] firmware: some documentation fixes Greg KH 2018-04-25 16:36 ` Greg KH 2018-05-03 23:31 ` [PATCH 1/9] " Luis R. Rodriguez 2018-05-03 23:31 ` Luis R. Rodriguez 2018-04-23 20:11 ` [PATCH 2/9] firmware: wrap FW_OPT_* into an enum Andres Rodriguez 2018-04-23 20:11 ` Andres Rodriguez 2018-05-03 23:35 ` Luis R. Rodriguez 2018-05-03 23:35 ` Luis R. Rodriguez 2018-04-23 20:11 ` [PATCH 3/9] firmware: add kernel-doc for enum fw_opt Andres Rodriguez 2018-04-23 20:11 ` Andres Rodriguez 2018-05-03 23:36 ` Luis R. Rodriguez 2018-05-03 23:36 ` Luis R. Rodriguez 2018-04-23 20:12 ` [PATCH 4/9] firmware: use () to terminate kernel-doc function names Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-05-03 23:37 ` Luis R. Rodriguez 2018-05-03 23:37 ` Luis R. Rodriguez 2018-04-23 20:12 ` [PATCH 5/9] firmware: add function to load firmware without warnings v5 Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-05-03 23:40 ` Luis R. Rodriguez 2018-05-03 23:40 ` Luis R. Rodriguez 2018-05-04 0:00 ` Luis R. Rodriguez 2018-05-04 0:00 ` Luis R. Rodriguez 2018-04-23 20:12 ` [PATCH 6/9] firmware: print firmware name on fallback path Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-05-03 23:42 ` Luis R. Rodriguez 2018-05-03 23:42 ` Luis R. Rodriguez 2018-05-05 2:57 ` Andres Rodriguez 2018-05-05 2:57 ` Andres Rodriguez 2018-05-08 0:20 ` Luis R. Rodriguez 2018-05-08 0:20 ` Luis R. Rodriguez 2018-05-12 8:03 ` Kalle Valo 2018-05-12 8:03 ` Kalle Valo 2018-05-12 8:03 ` Kalle Valo 2018-05-12 9:06 ` Luis R. Rodriguez 2018-05-12 9:06 ` Luis R. Rodriguez 2018-04-23 20:12 ` [PATCH 7/9] firmware: use rename fw_sysfs_fallback to use the firmware_ prefix Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-05-03 23:44 ` Luis R. Rodriguez [this message] 2018-05-03 23:44 ` Luis R. Rodriguez 2018-04-23 20:12 ` [PATCH 8/9] ath10k: use request_firmware_nowarn to load firmware Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-04-23 20:12 ` [PATCH 9/9] ath10k: re-enable the firmware fallback mechanism for testmode Andres Rodriguez 2018-04-23 20:12 ` Andres Rodriguez 2018-04-24 5:29 ` Kalle Valo 2018-04-24 5:29 ` Kalle Valo 2018-04-24 5:29 ` Kalle Valo
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=20180503234409.GY27853@wotan.suse.de \ --to=mcgrof@kernel.org \ --cc=alexdeucher@gmail.com \ --cc=andresx7@gmail.com \ --cc=arend.vanspriel@broadcom.com \ --cc=ath10k@lists.infradead.org \ --cc=christian.koenig@amd.com \ --cc=gregkh@linuxfoundation.org \ --cc=hdegoede@redhat.com \ --cc=keescook@chromium.org \ --cc=kvalo@codeaurora.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-wireless@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.