Re: [PATCH v2 3/3] firmware: Avoid bogus fallback warning

[Ming Lei]

On Mon, Nov 11, 2013 at 11:21 PM, Takashi Iwai <tiwai@xxxxxxx> wrote:
> The commit [3e358ac2bb5b: firmware: Be a bit more verbose about direct
> firmware loading failure] introduced a new warning message about
> falling back to user helper, but this isn't true when
> CONFIG_FW_LOADER_USER_HELPER isn't set.
>
> For avoiding the confusion, add a proper ifdef.  And now we can remove
> the dummy fw_load_from_user_helper(), too, since it's no longer called
> with CONFIG_FW_LOADER_USER_HELPER=n.
>
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> ---
>  drivers/base/firmware_class.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index 7f48a6ffb0df..bb03c71bd94d 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -940,14 +940,6 @@ static void kill_requests_without_uevent(void)
>  #endif
>
>  #else /* CONFIG_FW_LOADER_USER_HELPER */
> -static inline int
> -fw_load_from_user_helper(struct firmware *firmware, const char *name,
> -                        struct device *device, bool uevent, bool nowait,
> -                        long timeout)
> -{
> -       return -ENOENT;
> -}
> -
>  /* No abort during direct loading */
>  #define is_fw_load_aborted(buf) false
>
> @@ -1097,11 +1089,13 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
>         if (ret) {
>                 dev_warn(device, "Direct firmware load failed with error %d\n",
>                          ret);
> +#ifdef CONFIG_FW_LOADER_USER_HELPER
>                 if (fallback) {
>                         dev_warn(device, "Falling back to user helper\n");

I think it is simpler to put above line at the entry of
fw_load_from_user_helper()
since we always do direct-loading first, and code should be cleaner.

Thanks,
--
Ming Lei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/