]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
genirq/irqdesc: Use sysfs_emit() to instead of s*printf()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 16 Apr 2025 10:16:51 +0000 (13:16 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 16 Apr 2025 12:25:41 +0000 (14:25 +0200)
Follow the advice of the Documentation/filesystems/sysfs.rst that show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the value
to be returned to user space.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250416101651.2128688-1-andriy.shevchenko@linux.intel.com
kernel/irq/irqdesc.c

index 4258cd6bd3b4ff3fd996a64ea30c5556935048b5..4bcc6ff81e39054517b857d45c4c068862d718c6 100644 (file)
@@ -257,11 +257,11 @@ static ssize_t per_cpu_count_show(struct kobject *kobj,
        for_each_possible_cpu(cpu) {
                unsigned int c = irq_desc_kstat_cpu(desc, cpu);
 
-               ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s%u", p, c);
+               ret += sysfs_emit_at(buf, ret, "%s%u", p, c);
                p = ",";
        }
 
-       ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n");
+       ret += sysfs_emit_at(buf, ret, "\n");
        return ret;
 }
 IRQ_ATTR_RO(per_cpu_count);
@@ -273,10 +273,8 @@ static ssize_t chip_name_show(struct kobject *kobj,
        ssize_t ret = 0;
 
        raw_spin_lock_irq(&desc->lock);
-       if (desc->irq_data.chip && desc->irq_data.chip->name) {
-               ret = scnprintf(buf, PAGE_SIZE, "%s\n",
-                               desc->irq_data.chip->name);
-       }
+       if (desc->irq_data.chip && desc->irq_data.chip->name)
+               ret = sysfs_emit(buf, "%s\n", desc->irq_data.chip->name);
        raw_spin_unlock_irq(&desc->lock);
 
        return ret;
@@ -291,7 +289,7 @@ static ssize_t hwirq_show(struct kobject *kobj,
 
        raw_spin_lock_irq(&desc->lock);
        if (desc->irq_data.domain)
-               ret = sprintf(buf, "%lu\n", desc->irq_data.hwirq);
+               ret = sysfs_emit(buf, "%lu\n", desc->irq_data.hwirq);
        raw_spin_unlock_irq(&desc->lock);
 
        return ret;
@@ -305,8 +303,7 @@ static ssize_t type_show(struct kobject *kobj,
        ssize_t ret = 0;
 
        raw_spin_lock_irq(&desc->lock);
-       ret = sprintf(buf, "%s\n",
-                     irqd_is_level_type(&desc->irq_data) ? "level" : "edge");
+       ret = sysfs_emit(buf, "%s\n", irqd_is_level_type(&desc->irq_data) ? "level" : "edge");
        raw_spin_unlock_irq(&desc->lock);
 
        return ret;
@@ -321,7 +318,7 @@ static ssize_t wakeup_show(struct kobject *kobj,
        ssize_t ret = 0;
 
        raw_spin_lock_irq(&desc->lock);
-       ret = sprintf(buf, "%s\n", str_enabled_disabled(irqd_is_wakeup_set(&desc->irq_data)));
+       ret = sysfs_emit(buf, "%s\n", str_enabled_disabled(irqd_is_wakeup_set(&desc->irq_data)));
        raw_spin_unlock_irq(&desc->lock);
 
        return ret;
@@ -337,7 +334,7 @@ static ssize_t name_show(struct kobject *kobj,
 
        raw_spin_lock_irq(&desc->lock);
        if (desc->name)
-               ret = scnprintf(buf, PAGE_SIZE, "%s\n", desc->name);
+               ret = sysfs_emit(buf, "%s\n", desc->name);
        raw_spin_unlock_irq(&desc->lock);
 
        return ret;
@@ -354,14 +351,13 @@ static ssize_t actions_show(struct kobject *kobj,
 
        raw_spin_lock_irq(&desc->lock);
        for_each_action_of_desc(desc, action) {
-               ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%s%s",
-                                p, action->name);
+               ret += sysfs_emit_at(buf, ret, "%s%s", p, action->name);
                p = ",";
        }
        raw_spin_unlock_irq(&desc->lock);
 
        if (ret)
-               ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n");
+               ret += sysfs_emit_at(buf, ret, "\n");
 
        return ret;
 }