lkml.org 
[lkml]   [2021]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 1/3] string: Consolidate yesno() helpers under string.h hood
    Date
    We have already few similar implementation and a lot of code that can benefit
    of the yesno() helper. Consolidate yesno() helpers under string.h hood.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +-----
    drivers/gpu/drm/i915/i915_utils.h | 6 +-----
    drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 12 +-----------
    include/linux/string.h | 5 +++++
    4 files changed, 8 insertions(+), 21 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
    index 360952129b6d..7fde4f90e513 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
    @@ -23,6 +23,7 @@
    *
    */

    +#include <linux/string.h>
    #include <linux/uaccess.h>

    #include <drm/drm_debugfs.h>
    @@ -49,11 +50,6 @@ struct dmub_debugfs_trace_entry {
    uint32_t param1;
    };

    -static inline const char *yesno(bool v)
    -{
    - return v ? "yes" : "no";
    -}
    -
    /* parse_write_buffer_into_params - Helper function to parse debugfs write buffer into an array
    *
    * Function takes in attributes passed to debugfs write entry
    diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
    index abd4dcd9f79c..e6da5a951132 100644
    --- a/drivers/gpu/drm/i915/i915_utils.h
    +++ b/drivers/gpu/drm/i915/i915_utils.h
    @@ -27,6 +27,7 @@

    #include <linux/list.h>
    #include <linux/overflow.h>
    +#include <linux/string.h>
    #include <linux/sched.h>
    #include <linux/types.h>
    #include <linux/workqueue.h>
    @@ -408,11 +409,6 @@ wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms)
    #define MBps(x) KBps(1000 * (x))
    #define GBps(x) ((u64)1000 * MBps((x)))

    -static inline const char *yesno(bool v)
    -{
    - return v ? "yes" : "no";
    -}
    -
    static inline const char *onoff(bool v)
    {
    return v ? "on" : "off";
    diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
    index 7d49fd4edc9e..c857d73abbd7 100644
    --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
    +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
    @@ -34,6 +34,7 @@

    #include <linux/seq_file.h>
    #include <linux/debugfs.h>
    +#include <linux/string.h>
    #include <linux/string_helpers.h>
    #include <linux/sort.h>
    #include <linux/ctype.h>
    @@ -2015,17 +2016,6 @@ static const struct file_operations rss_debugfs_fops = {
    /* RSS Configuration.
    */

    -/* Small utility function to return the strings "yes" or "no" if the supplied
    - * argument is non-zero.
    - */
    -static const char *yesno(int x)
    -{
    - static const char *yes = "yes";
    - static const char *no = "no";
    -
    - return x ? yes : no;
    -}
    -
    static int rss_config_show(struct seq_file *seq, void *v)
    {
    struct adapter *adapter = seq->private;
    diff --git a/include/linux/string.h b/include/linux/string.h
    index 9521d8cab18e..fd946a5e18c8 100644
    --- a/include/linux/string.h
    +++ b/include/linux/string.h
    @@ -308,4 +308,9 @@ static __always_inline size_t str_has_prefix(const char *str, const char *prefix
    return strncmp(str, prefix, len) == 0 ? len : 0;
    }

    +static inline const char *yesno(bool yes)
    +{
    + return yes ? "yes" : "no";
    +}
    +
    #endif /* _LINUX_STRING_H_ */
    --
    2.30.0
    \
     
     \ /
      Last update: 2021-02-15 15:24    [W:4.083 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site