Skip to contentSkip to conversation

toshiba_acpi: Accelerometer updates

PATCH In review Azael Avalos 2 participants 4 messages Jun 28, 2016

Subsystems (2)
lore
Share & tools
lore

Azael Avalos

author maintainer
#0 lore raw

v3 cover toshiba_acpi: Accelerometer updates

These series of patches update the accelerometer axis data reporting to use the IIO subsystem, deprecating the custom position sysfs entry, and finally bumping the driver version to 0.24.

Changes since v2:
- Small format and style changes once again
- Renamed toshiba_accel* functions to toshiba_iio_accel* to differentiate from the iio functions and the toshiba_acpi driver fuctions
- Print error messages instead of bailing out in case the iio_device* functions fail, this is to allow the driver to continue loading its many functions

Changes since v1:
- Small format and style changes
- Changed the iio code according to feedback from Jonathan Cameron

Azael Avalos (3):
toshiba_acpi: Add IIO interface for accelerometer axis data
toshiba_acpi: Remove the position sysfs entry
toshiba_acpi: Bump driver version and update copyright year

 drivers/platform/x86/toshiba_acpi.c | 136 +++++++++++++++++++++++++++++-------
 1 file changed, 109 insertions(+), 27 deletions(-)
Signature · 1 line
2.8.4
author maintainer
#1 lore raw

PATCH v3 2/3 toshiba_acpi: Remove the position sysfs entry

Now that we have proper support for the acceleromeer under the IIO subsystem, the _position_ sysfs file is now deprecated.

This patch removes all code related to the position sysfs entry.

---
 drivers/platform/x86/toshiba_acpi.c | 25 -------------------------
 1 file changed, 25 deletions(-)
drivers/platform/x86/toshiba_acpi.c +0 -25
index bd9b346a..ea0262e 100644
@@ -1961,28 +1961,6 @@ static ssize_t touchpad_show(struct device *dev,
 }
 static DEVICE_ATTR_RW(touchpad);
 
-static ssize_t position_show(struct device *dev,
-			     struct device_attribute *attr, char *buf)
-{
-	struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
-	u32 xyval, zval, tmp;
-	u16 x, y, z;
-	int ret;
-
-	xyval = zval = 0;
-	ret = toshiba_accelerometer_get(toshiba, &xyval, &zval);
-	if (ret < 0)
-		return ret;
-
-	x = xyval & HCI_ACCEL_MASK;
-	tmp = xyval >> HCI_MISC_SHIFT;
-	y = tmp & HCI_ACCEL_MASK;
-	z = zval & HCI_ACCEL_MASK;
-
-	return sprintf(buf, "%d %d %d\n", x, y, z);
-}
-static DEVICE_ATTR_RO(position);
-
 static ssize_t usb_sleep_charge_show(struct device *dev,
 				     struct device_attribute *attr, char *buf)
 {
@@ -2353,7 +2331,6 @@ static struct attribute *toshiba_attributes[] = {
 	&dev_attr_available_kbd_modes.attr,
 	&dev_attr_kbd_backlight_timeout.attr,
 	&dev_attr_touchpad.attr,
-	&dev_attr_position.attr,
 	&dev_attr_usb_sleep_charge.attr,
 	&dev_attr_sleep_functions_on_battery.attr,
 	&dev_attr_usb_rapid_charge.attr,
@@ -2380,8 +2357,6 @@ static umode_t toshiba_sysfs_is_visible(struct kobject *kobj,
 		exists = (drv->kbd_mode == SCI_KBD_MODE_AUTO) ? true : false;
 	else if (attr == &dev_attr_touchpad.attr)
 		exists = (drv->touchpad_supported) ? true : false;
-	else if (attr == &dev_attr_position.attr)
-		exists = (drv->accelerometer_supported) ? true : false;
 	else if (attr == &dev_attr_usb_sleep_charge.attr)
 		exists = (drv->usb_sleep_charge_supported) ? true : false;
 	else if (attr == &dev_attr_sleep_functions_on_battery.attr)
Signature · 1 line
2.8.4
author maintainer
#2 lore raw

PATCH v3 3/3 toshiba_acpi: Bump driver version and update copyright year

In reply to Azael Avalos

After several fixes, and added support for more features (WWAN, Cooling Method and IIO accelometer axis data), bump the driver version to 0.24.

Also update the copyright year.

---
 drivers/platform/x86/toshiba_acpi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/toshiba_acpi.c +2 -2
index ea0262e..9d60a40 100644
@@ -4,7 +4,7 @@
  *  Copyright (C) 2002-2004 John Belmonte
  *  Copyright (C) 2008 Philip Langdale
  *  Copyright (C) 2010 Pierre Ducroquet
- *  Copyright (C) 2014-2015 Azael Avalos
+ *  Copyright (C) 2014-2016 Azael Avalos
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#define TOSHIBA_ACPI_VERSION	"0.23"
+#define TOSHIBA_ACPI_VERSION	"0.24"
 #define PROC_INTERFACE_VERSION	1
 
 #include <linux/kernel.h>
Signature · 1 line
2.8.4
#3 lore raw
In reply to Azael Avalos
Quoted 5 lines · Azael Avalos

These series of patches update the accelerometer axis data reporting to use the IIO subsystem, deprecating the custom position sysfs entry, and finally bumping the driver version to 0.24.

Thanks Azael, queued to testing for 4.8.

Jonathan, I took the full set.

Quoted 25 lines

Changes since v2:
- Small format and style changes once again
- Renamed toshiba_accel* functions to toshiba_iio_accel* to differentiate from the iio functions and the toshiba_acpi driver fuctions
- Print error messages instead of bailing out in case the iio_device* functions fail, this is to allow the driver to continue loading its many functions

Changes since v1:
- Small format and style changes
- Changed the iio code according to feedback from Jonathan Cameron

Azael Avalos (3):
toshiba_acpi: Add IIO interface for accelerometer axis data
toshiba_acpi: Remove the position sysfs entry
toshiba_acpi: Bump driver version and update copyright year

 drivers/platform/x86/toshiba_acpi.c | 136 +++++++++++++++++++++++++++++-------
 1 file changed, 109 insertions(+), 27 deletions(-)
Signature · 1 line
2.8.4
Signature · 2 lines
Darren Hart
Intel Open Source Technology Center