| Message ID | 20240418072257.631977-1-jiangyunshui@kylinos.cn (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | platform/x86: msi-laptop: Use sysfs_emit() to replace sprintf() | expand |
Hi, Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> On 4/18/24 9:22 AM, yunshui wrote: > As Documentation/filesystems/sysfs.rst suggested, > show() should only use sysfs_emit() or sysfs_emit_at() when formatting > the value to be returned to user space. > > Signed-off-by: yunshui <jiangyunshui@kylinos.cn> > Signed-off-by: Ai Chao <aichao@kylinos.cn> Note same weird S-o-b here though. Regards, Hans > --- > drivers/platform/x86/msi-laptop.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c > index f4c6c36e05a5..e5391a37014d 100644 > --- a/drivers/platform/x86/msi-laptop.c > +++ b/drivers/platform/x86/msi-laptop.c > @@ -317,7 +317,7 @@ static ssize_t show_wlan(struct device *dev, > if (ret < 0) > return ret; > > - return sprintf(buf, "%i\n", enabled); > + return sysfs_emit(buf, "%i\n", enabled); > } > > static ssize_t store_wlan(struct device *dev, > @@ -341,7 +341,7 @@ static ssize_t show_bluetooth(struct device *dev, > if (ret < 0) > return ret; > > - return sprintf(buf, "%i\n", enabled); > + return sysfs_emit(buf, "%i\n", enabled); > } > > static ssize_t store_bluetooth(struct device *dev, > @@ -364,7 +364,7 @@ static ssize_t show_threeg(struct device *dev, > if (ret < 0) > return ret; > > - return sprintf(buf, "%i\n", threeg_s); > + return sysfs_emit(buf, "%i\n", threeg_s); > } > > static ssize_t store_threeg(struct device *dev, > @@ -383,7 +383,7 @@ static ssize_t show_lcd_level(struct device *dev, > if (ret < 0) > return ret; > > - return sprintf(buf, "%i\n", ret); > + return sysfs_emit(buf, "%i\n", ret); > } > > static ssize_t store_lcd_level(struct device *dev, > @@ -413,7 +413,7 @@ static ssize_t show_auto_brightness(struct device *dev, > if (ret < 0) > return ret; > > - return sprintf(buf, "%i\n", ret); > + return sysfs_emit(buf, "%i\n", ret); > } > > static ssize_t store_auto_brightness(struct device *dev, > @@ -443,7 +443,7 @@ static ssize_t show_touchpad(struct device *dev, > if (result < 0) > return result; > > - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK)); > + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK)); > } > > static ssize_t show_turbo(struct device *dev, > @@ -457,7 +457,7 @@ static ssize_t show_turbo(struct device *dev, > if (result < 0) > return result; > > - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK)); > + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK)); > } > > static ssize_t show_eco(struct device *dev, > @@ -471,7 +471,7 @@ static ssize_t show_eco(struct device *dev, > if (result < 0) > return result; > > - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK)); > + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK)); > } > > static ssize_t show_turbo_cooldown(struct device *dev, > @@ -485,7 +485,7 @@ static ssize_t show_turbo_cooldown(struct device *dev, > if (result < 0) > return result; > > - return sprintf(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) | > + return sysfs_emit(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) | > (!!(rdata & MSI_STANDARD_EC_TURBO_COOLDOWN_MASK) << 1)); > } > > @@ -500,7 +500,7 @@ static ssize_t show_auto_fan(struct device *dev, > if (result < 0) > return result; > > - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK)); > + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK)); > } > > static ssize_t store_auto_fan(struct device *dev,
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index f4c6c36e05a5..e5391a37014d 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -317,7 +317,7 @@ static ssize_t show_wlan(struct device *dev, if (ret < 0) return ret; - return sprintf(buf, "%i\n", enabled); + return sysfs_emit(buf, "%i\n", enabled); } static ssize_t store_wlan(struct device *dev, @@ -341,7 +341,7 @@ static ssize_t show_bluetooth(struct device *dev, if (ret < 0) return ret; - return sprintf(buf, "%i\n", enabled); + return sysfs_emit(buf, "%i\n", enabled); } static ssize_t store_bluetooth(struct device *dev, @@ -364,7 +364,7 @@ static ssize_t show_threeg(struct device *dev, if (ret < 0) return ret; - return sprintf(buf, "%i\n", threeg_s); + return sysfs_emit(buf, "%i\n", threeg_s); } static ssize_t store_threeg(struct device *dev, @@ -383,7 +383,7 @@ static ssize_t show_lcd_level(struct device *dev, if (ret < 0) return ret; - return sprintf(buf, "%i\n", ret); + return sysfs_emit(buf, "%i\n", ret); } static ssize_t store_lcd_level(struct device *dev, @@ -413,7 +413,7 @@ static ssize_t show_auto_brightness(struct device *dev, if (ret < 0) return ret; - return sprintf(buf, "%i\n", ret); + return sysfs_emit(buf, "%i\n", ret); } static ssize_t store_auto_brightness(struct device *dev, @@ -443,7 +443,7 @@ static ssize_t show_touchpad(struct device *dev, if (result < 0) return result; - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK)); + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK)); } static ssize_t show_turbo(struct device *dev, @@ -457,7 +457,7 @@ static ssize_t show_turbo(struct device *dev, if (result < 0) return result; - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK)); + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK)); } static ssize_t show_eco(struct device *dev, @@ -471,7 +471,7 @@ static ssize_t show_eco(struct device *dev, if (result < 0) return result; - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK)); + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK)); } static ssize_t show_turbo_cooldown(struct device *dev, @@ -485,7 +485,7 @@ static ssize_t show_turbo_cooldown(struct device *dev, if (result < 0) return result; - return sprintf(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) | + return sysfs_emit(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) | (!!(rdata & MSI_STANDARD_EC_TURBO_COOLDOWN_MASK) << 1)); } @@ -500,7 +500,7 @@ static ssize_t show_auto_fan(struct device *dev, if (result < 0) return result; - return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK)); + return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK)); } static ssize_t store_auto_fan(struct device *dev,
As Documentation/filesystems/sysfs.rst suggested, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Signed-off-by: yunshui <jiangyunshui@kylinos.cn> Signed-off-by: Ai Chao <aichao@kylinos.cn> --- drivers/platform/x86/msi-laptop.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)