toshiba_haps: Some misc changes plus sysfs entries documentation
Azael Avalos
maintainercover toshiba_haps: Some misc changes plus sysfs entries documentation
These patches make some misc chanes to the driver, replacing sscanf with kstrtoint, DEVICE_ATTR_{RW, WO} macros and adding documentation about the sysfs entries.
Azael Avalos (3):
toshiba_haps: Replace sscanf with kstrtoint
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros Documentation/ABI: Add file describing the sysfs entries for
toshiba_haps
.../ABI/testing/sysfs-driver-toshiba_haps | 20 ++++++++++++++ drivers/platform/x86/toshiba_haps.c | 32 ++++++++++++++-------- 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps
Signature · 1 line
2.2.2
Azael Avalos
maintainerPATCH 1/3 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.
--- drivers/platform/x86/toshiba_haps.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/platform/x86/toshiba_haps.c +18 -8
@@ -78,15 +78,20 @@ static ssize_t protection_level_store(struct device *dev, const char *buf, size_t count) {struct toshiba_haps_dev *haps =dev_get_drvdata (dev); -int level, ret; - -if (sscanf (buf,"%d" , &level) !=1 || level <0 || level >3 ) -return -EINVAL ; +int level; +int ret; -/* Set the sensor level. -* Acceptable levels are: + ret =kstrtoint (buf,0 , &level); +if (ret) +return ret; +/* +* Check for supported levels, which can be: * 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);if (ret !=0 )return ret;
@@ -101,9 +106,14 @@ static ssize_t reset_protection_store(struct device *dev, const char *buf, size_t count) {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 ;/* Reset the protection interface */
Signature · 1 line
2.2.2
Azael Avalos
maintainerPATCH 2/3 toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros
In reply to Azael AvalosThis patch makes use of DEVICE_ATTR_{RW, WO} macros, simplifying device attributes creation.
--- drivers/platform/x86/toshiba_haps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/platform/x86/toshiba_haps.c +2 -4
@@ -100,6 +100,7 @@ static ssize_t protection_level_store(struct device *dev,return count; } +static DEVICE_ATTR_RW (protection_level); static ssize_t reset_protection_store(struct device *dev, struct device_attribute *attr,
@@ -123,10 +124,7 @@ static ssize_t reset_protection_store(struct device *dev,return count; } - -static DEVICE_ATTR(protection_level, S_IRUGO | S_IWUSR, - protection_level_show, protection_level_store); -static DEVICE_ATTR(reset_protection, S_IWUSR, NULL, reset_protection_store); +static DEVICE_ATTR_WO (reset_protection);static struct attribute *haps_attributes[] = { &dev_attr_protection_level.attr,
Signature · 1 line
2.2.2
Darren Hart
AppliedQuoted 10 lines · Azael Avalos
These patches make some misc chanes to the driver, replacing sscanf with kstrtoint, DEVICE_ATTR_{RW, WO} macros and adding documentation about the sysfs entries.
Azael Avalos (3):
toshiba_haps: Replace sscanf with kstrtoint
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macrosDocumentation/ABI: Add file describing the sysfs entries for
toshiba_haps
Quoted 4 lines
.../ABI/testing/sysfs-driver-toshiba_haps | 20 ++++++++++++++ drivers/platform/x86/toshiba_haps.c | 32 ++++++++++++++-------- 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps
Queued for 4.1, thanks Azael.
Signature · 2 lines
Darren Hart Intel Open Source Technology Center
Azael Avalos
maintainerHi Darren,
2015-03-06 11:32 GMT-07:00 Darren Hart <[email protected]>:
Quoted 11 lines · Azael Avalos
Quoted 10 lines
These patches make some misc chanes to the driver, replacing sscanf with kstrtoint, DEVICE_ATTR_{RW, WO} macros and adding documentation about the sysfs entries.
Azael Avalos (3):
toshiba_haps: Replace sscanf with kstrtoint
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macrosDocumentation/ABI: Add file describing the sysfs entries for
toshiba_haps
Quoted 6 lines
Quoted 4 lines
.../ABI/testing/sysfs-driver-toshiba_haps | 20 ++++++++++++++ drivers/platform/x86/toshiba_haps.c | 32 ++++++++++++++-------- 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_hapsQueued for 4.1, thanks Azael.
These patches were supposed to be included in 4.1, but somehow they didn't, can you re-queue for 4.2?
Quoted 4 lines
--
Darren Hart
Intel Open Source Technology Center
Cheers
Azael
Signature · 1 line
-- El mundo apesta y vosotros apestais tambien --
Quoted 20 lines · Azael Avalos
Hi Darren,
2015-03-06 11:32 GMT-07:00 Darren Hart <[email protected]>:
Quoted 16 lines · Azael Avalos
Quoted 14 lines
These patches make some misc chanes to the driver, replacing sscanf with kstrtoint, DEVICE_ATTR_{RW, WO} macros and adding documentation about the sysfs entries.
Azael Avalos (3):
toshiba_haps: Replace sscanf with kstrtoint
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macrosDocumentation/ABI: Add file describing the sysfs entries for
toshiba_haps.../ABI/testing/sysfs-driver-toshiba_haps | 20 ++++++++++++++ drivers/platform/x86/toshiba_haps.c | 32 ++++++++++++++-------- 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps
Quoted 4 lines
Quoted 1 line
Queued for 4.1, thanks Azael.
These patches were supposed to be included in 4.1, but somehow they didn't, can you re-queue for 4.2?
So sorry, I honestly have no idea what happened :/ I don't reply with queued until I have them in a branch... apologies. You should see them in for-next by tomorrow.
Signature · 2 lines
Darren Hart Intel Open Source Technology Center