lkml.org 
[lkml]   [2022]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] x86/sysfs: Add format parameter to macro defining "show" functions for proc
    Date
    All the simple (non-mask and non-list files in
    /sys/devices/system/cpu/cpu0/topology/ are currently printed as decimal
    integers.

    Refactor the macro that generates the "show" functions to take a format
    parameter to allow future files to display in other formats.

    No functional change.

    Signed-off-by: Tony Luck <tony.luck@intel.com>
    ---
    drivers/base/topology.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/base/topology.c b/drivers/base/topology.c
    index 8f2b641d0b8c..793c592e533a 100644
    --- a/drivers/base/topology.c
    +++ b/drivers/base/topology.c
    @@ -14,11 +14,11 @@
    #include <linux/hardirq.h>
    #include <linux/topology.h>

    -#define define_id_show_func(name) \
    +#define define_id_show_func(name, fmt) \
    static ssize_t name##_show(struct device *dev, \
    struct device_attribute *attr, char *buf) \
    { \
    - return sysfs_emit(buf, "%d\n", topology_##name(dev->id)); \
    + return sysfs_emit(buf, fmt "\n", topology_##name(dev->id)); \
    }

    #define define_siblings_read_func(name, mask) \
    @@ -42,16 +42,16 @@ static ssize_t name##_list_read(struct file *file, struct kobject *kobj, \
    off, count); \
    }

    -define_id_show_func(physical_package_id);
    +define_id_show_func(physical_package_id, "%d");
    static DEVICE_ATTR_RO(physical_package_id);

    -define_id_show_func(die_id);
    +define_id_show_func(die_id, "%d");
    static DEVICE_ATTR_RO(die_id);

    -define_id_show_func(cluster_id);
    +define_id_show_func(cluster_id, "%d");
    static DEVICE_ATTR_RO(cluster_id);

    -define_id_show_func(core_id);
    +define_id_show_func(core_id, "%d");
    static DEVICE_ATTR_RO(core_id);

    define_siblings_read_func(thread_siblings, sibling_cpumask);
    @@ -79,7 +79,7 @@ static BIN_ATTR_RO(package_cpus, 0);
    static BIN_ATTR_RO(package_cpus_list, 0);

    #ifdef CONFIG_SCHED_BOOK
    -define_id_show_func(book_id);
    +define_id_show_func(book_id, "%d");
    static DEVICE_ATTR_RO(book_id);
    define_siblings_read_func(book_siblings, book_cpumask);
    static BIN_ATTR_RO(book_siblings, 0);
    @@ -87,7 +87,7 @@ static BIN_ATTR_RO(book_siblings_list, 0);
    #endif

    #ifdef CONFIG_SCHED_DRAWER
    -define_id_show_func(drawer_id);
    +define_id_show_func(drawer_id, "%d");
    static DEVICE_ATTR_RO(drawer_id);
    define_siblings_read_func(drawer_siblings, drawer_cpumask);
    static BIN_ATTR_RO(drawer_siblings, 0);
    --
    2.31.1
    \
     
     \ /
      Last update: 2022-01-07 23:55    [W:3.470 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site