lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 04/11] firmware: simplify CONFIG_FW_LOADER_USER_HELPER_FALLBACK further
    Date
    All CONFIG_FW_LOADER_USER_HELPER_FALLBACK really is, is just a bool,
    initailized at build time. Define it as such. This simplifies the
    logic even further, removing now all explicit #ifdefs around the code.

    Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
    ---
    drivers/base/firmware_loader.c | 25 ++++++++++++++++++-------
    1 file changed, 18 insertions(+), 7 deletions(-)

    diff --git a/drivers/base/firmware_loader.c b/drivers/base/firmware_loader.c
    index 7dd36ace6152..59dba794ce1a 100644
    --- a/drivers/base/firmware_loader.c
    +++ b/drivers/base/firmware_loader.c
    @@ -266,6 +266,22 @@ static inline bool fw_state_is_aborted(struct fw_priv *fw_priv)

    #ifdef CONFIG_FW_LOADER_USER_HELPER

    +/**
    + * struct firmware_fallback_config - firmware fallback configuratioon settings
    + *
    + * Helps describe and fine tune the fallback mechanism.
    + *
    + * @force_sysfs_fallback: force the sysfs fallback mechanism to be used
    + * as if one had enabled CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y.
    + */
    +struct firmware_fallback_config {
    + bool force_sysfs_fallback;
    +};
    +
    +static const struct firmware_fallback_config fw_fallback_config = {
    + .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK),
    +};
    +
    static inline bool fw_sysfs_done(struct fw_priv *fw_priv)
    {
    return __fw_state_check(fw_priv, FW_STATUS_DONE);
    @@ -1151,19 +1167,14 @@ static int fw_load_from_user_helper(struct firmware *firmware,
    return ret;
    }

    -#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK
    -static bool fw_force_sysfs_fallback(unsigned int opt_flags)
    -{
    - return true;
    -}
    -#else
    static bool fw_force_sysfs_fallback(unsigned int opt_flags)
    {
    + if (fw_fallback_config.force_sysfs_fallback)
    + return true;
    if (!(opt_flags & FW_OPT_USERHELPER))
    return false;
    return true;
    }
    -#endif

    static bool fw_run_sysfs_fallback(unsigned int opt_flags)
    {
    --
    2.16.2
    \
     
     \ /
      Last update: 2018-02-24 03:49    [W:4.049 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site