5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qing Wang wangqing@vivo.com
[ Upstream commit 2d5b0755b754fcb39598df87b3a8656a569e9979 ]
show() must not use snprintf() when formatting the value to be returned to user space.
Fix the coccicheck warnings: WARNING: use scnprintf or sprintf.
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
Signed-off-by: Qing Wang wangqing@vivo.com Link: https://lore.kernel.org/r/1634280641-4862-1-git-send-email-wangqing@vivo.com Reviewed-by: Hans de Goede hdegoede@redhat.com Signed-off-by: Hans de Goede hdegoede@redhat.com Stable-dep-of: 5c7bebc1a3f0 ("platform/x86: panasonic-laptop: Return errno correctly in show callback") Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/platform/x86/panasonic-laptop.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c index 24d4c008778ed..26f4d15c3bf13 100644 --- a/drivers/platform/x86/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c @@ -509,7 +509,7 @@ static ssize_t numbatt_show(struct device *dev, struct device_attribute *attr, if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]); }
static ssize_t lcdtype_show(struct device *dev, struct device_attribute *attr, @@ -521,7 +521,7 @@ static ssize_t lcdtype_show(struct device *dev, struct device_attribute *attr, if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_LCD_TYPE]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_LCD_TYPE]); }
static ssize_t mute_show(struct device *dev, struct device_attribute *attr, @@ -533,7 +533,7 @@ static ssize_t mute_show(struct device *dev, struct device_attribute *attr, if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_MUTE]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_MUTE]); }
static ssize_t mute_store(struct device *dev, struct device_attribute *attr, @@ -563,7 +563,7 @@ static ssize_t sticky_key_show(struct device *dev, struct device_attribute *attr if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sticky_key); + return sysfs_emit(buf, "%u\n", pcc->sticky_key); }
static ssize_t sticky_key_store(struct device *dev, struct device_attribute *attr, @@ -605,7 +605,7 @@ static ssize_t eco_mode_show(struct device *dev, struct device_attribute *attr, result = -EIO; break; } - return snprintf(buf, PAGE_SIZE, "%u\n", result); + return sysfs_emit(buf, "%u\n", result); }
static ssize_t eco_mode_store(struct device *dev, struct device_attribute *attr, @@ -664,7 +664,7 @@ static ssize_t ac_brightness_show(struct device *dev, struct device_attribute *a if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_AC_CUR_BRIGHT]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_AC_CUR_BRIGHT]); }
static ssize_t ac_brightness_store(struct device *dev, struct device_attribute *attr, @@ -694,7 +694,7 @@ static ssize_t dc_brightness_show(struct device *dev, struct device_attribute *a if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_DC_CUR_BRIGHT]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_DC_CUR_BRIGHT]); }
static ssize_t dc_brightness_store(struct device *dev, struct device_attribute *attr, @@ -724,7 +724,7 @@ static ssize_t current_brightness_show(struct device *dev, struct device_attribu if (!acpi_pcc_retrieve_biosdata(pcc)) return -EIO;
- return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_CUR_BRIGHT]); + return sysfs_emit(buf, "%u\n", pcc->sinf[SINF_CUR_BRIGHT]); }
static ssize_t current_brightness_store(struct device *dev, struct device_attribute *attr, @@ -749,7 +749,7 @@ static ssize_t current_brightness_store(struct device *dev, struct device_attrib static ssize_t cdpower_show(struct device *dev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", get_optd_power_state()); + return sysfs_emit(buf, "%d\n", get_optd_power_state()); }
static ssize_t cdpower_store(struct device *dev, struct device_attribute *attr,