]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: synaptics-rmi4 - convert to use sysfs_emit() APIs
authorzhang songyi <zhang.songyi@zte.com.cn>
Tue, 27 Sep 2022 15:56:06 +0000 (08:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:05:18 +0000 (11:05 +0100)
[ Upstream commit 9dedc915937c33302df7fcab01c45e7936d6195a ]

Follow the advice of the Documentation/filesystems/sysfs.rst and show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the value
to be returned to user space.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: zhang songyi <zhang.songyi@zte.com.cn>
Link: https://lore.kernel.org/r/20220927070936.258300-1-zhang.songyi@zte.com.cn
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Stable-dep-of: ca39500f6af9 ("Input: synaptics-rmi - fix crash with unsupported versions of F34")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/input/rmi4/rmi_f34.c

index e5dca9868f87f3de65447c645ba66cc9638bc52d..c26808f10827a0adad38b204a8ee82c88c0bfea8 100644 (file)
@@ -321,13 +321,13 @@ static ssize_t rmi_driver_bootloader_id_show(struct device *dev,
                f34 = dev_get_drvdata(&fn->dev);
 
                if (f34->bl_version == 5)
-                       return scnprintf(buf, PAGE_SIZE, "%c%c\n",
-                                        f34->bootloader_id[0],
-                                        f34->bootloader_id[1]);
+                       return sysfs_emit(buf, "%c%c\n",
+                                         f34->bootloader_id[0],
+                                         f34->bootloader_id[1]);
                else
-                       return scnprintf(buf, PAGE_SIZE, "V%d.%d\n",
-                                        f34->bootloader_id[1],
-                                        f34->bootloader_id[0]);
+                       return sysfs_emit(buf, "V%d.%d\n",
+                                         f34->bootloader_id[1],
+                                         f34->bootloader_id[0]);
        }
 
        return 0;
@@ -346,7 +346,7 @@ static ssize_t rmi_driver_configuration_id_show(struct device *dev,
        if (fn) {
                f34 = dev_get_drvdata(&fn->dev);
 
-               return scnprintf(buf, PAGE_SIZE, "%s\n", f34->configuration_id);
+               return sysfs_emit(buf, "%s\n", f34->configuration_id);
        }
 
        return 0;
@@ -499,7 +499,7 @@ static ssize_t rmi_driver_update_fw_status_show(struct device *dev,
        if (data->f34_container)
                update_status = rmi_f34_status(data->f34_container);
 
-       return scnprintf(buf, PAGE_SIZE, "%d\n", update_status);
+       return sysfs_emit(buf, "%d\n", update_status);
 }
 
 static DEVICE_ATTR(update_fw_status, 0444,