hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

toshiba_haps: Replace sscanf with kstrtoint 

This patch simply replaces the use of sscanf with kstrtoint returning
the error code in case that something went bad.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
Azael Avalos 2015-02-26 10:58:30 -07:00 committed by Darren Hart
parent 63ba3e28fd
commit a882003714
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/platform/x86/toshiba_haps.c
View File

@ -78,15 +78,20 @@ static ssize_t protection_level_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct toshiba_haps_dev *haps = dev_get_drvdata(dev); struct toshiba_haps_dev *haps = dev_get_drvdata(dev);
int level, ret; int level;
int ret;
if (sscanf(buf, "%d", &level) != 1 || level < 0 || level > 3) ret = kstrtoint(buf, 0, &level);
return -EINVAL; if (ret)
return ret;
/* Set the sensor level. /*
* Acceptable levels are: * Check for supported levels, which can be:
* 0 - Disabled | 1 - Low | 2 - Medium | 3 - High * 0 - Disabled | 1 - Low | 2 - Medium | 3 - High
*/ */
if (level < 0 || level > 3)
return -EINVAL;
/* Set the sensor level */
ret = toshiba_haps_protection_level(haps->acpi_dev->handle, level); ret = toshiba_haps_protection_level(haps->acpi_dev->handle, level);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -101,9 +106,14 @@ static ssize_t reset_protection_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct toshiba_haps_dev *haps = dev_get_drvdata(dev); struct toshiba_haps_dev *haps = dev_get_drvdata(dev);
int reset, ret; int reset;
int ret;
if (sscanf(buf, "%d", &reset) != 1 || reset != 1) ret = kstrtoint(buf, 0, &reset);
if (ret)
return ret;
/* The only accepted value is 1 */
if (reset != 1)
return -EINVAL; return -EINVAL;
/* Reset the protection interface */ /* Reset the protection interface */