Skip to contentSkip to conversation

thinkpad_acpi: Add adaptive_kbd_mode sysfs attr

PATCH In review Bastien Nocera 3 participants 5 messages Feb 18, 2015 – Feb 23, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/6 thinkpad_acpi: Add adaptive_kbd_mode sysfs attr

---
 drivers/platform/x86/thinkpad_acpi.c | 71 +++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +62 -9
index a6dd017..562d958 100644
@@ -2917,6 +2917,59 @@ static void hotkey_wakeup_hotunplug_complete_notify_change(void)
 		     "wakeup_hotunplug_complete");
 }
 
+/* sysfs adaptive kbd mode --------------------------------------------- */
+
+static int adaptive_keyboard_get_mode(void);
+static int adaptive_keyboard_set_mode(int new_mode);
+
+enum ADAPTIVE_KEY_MODE {
+	HOME_MODE,
+	WEB_BROWSER_MODE,
+	WEB_CONFERENCE_MODE,
+	FUNCTION_MODE,
+	LAYFLAT_MODE
+};
+
+static ssize_t adaptive_kbd_mode_show(struct device *dev,
+			   struct device_attribute *attr,
+			   char *buf)
+{
+	u32 current_mode;
+
+	current_mode = adaptive_keyboard_get_mode();
+	if (current_mode < 0)
+		return current_mode;
+
+	return snprintf(buf, PAGE_SIZE, "%d\n", current_mode);
+}
+
+static ssize_t adaptive_kbd_mode_store(struct device *dev,
+			    struct device_attribute *attr,
+			    const char *buf, size_t count)
+{
+	unsigned long t;
+	int res;
+
+	if (parse_strtoul(buf, LAYFLAT_MODE, &t))
+		return -EINVAL;
+
+	res = adaptive_keyboard_set_mode(t);
+	return (res < 0) ? res : count;
+}
+
+static struct device_attribute dev_attr_adaptive_kbd_mode =
+	__ATTR(adaptive_kbd_mode, S_IWUSR | S_IRUGO,
+		adaptive_kbd_mode_show, adaptive_kbd_mode_store);
+
+static struct attribute *adaptive_kbd_attributes[] = {
+	&dev_attr_adaptive_kbd_mode.attr,
+	NULL
+};
+
+static const struct attribute_group adaptive_kbd_attr_group = {
+	.attrs = adaptive_kbd_attributes,
+};
+
 /* --------------------------------------------------------------------- */
 
 static struct attribute *hotkey_attributes[] __initdata = {
@@ -3230,8 +3283,13 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 	/* does it have an adaptive keyboard, like
 	 * the Lenovo Carbon X1 2014 (2nd gen) */
 	if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
-		if ((hkeyv >> 8) == 2)
+		if ((hkeyv >> 8) == 2) {
 			tp_features.has_adaptive_kbd = true;
+			res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
+					&adaptive_kbd_attr_group);
+			if (res)
+				goto err_exit;
+		}
 	}
 
 	quirks = tpacpi_check_quirks(tpacpi_hotkey_qtable,
@@ -3444,6 +3502,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 
 err_exit:
 	delete_attr_set(hotkey_dev_attributes, &tpacpi_pdev->dev.kobj);
+	sysfs_remove_group(&tpacpi_pdev->dev.kobj,
+			&adaptive_kbd_attr_group);
+
 	hotkey_dev_attributes = NULL;
 
 	return (res < 0) ? res : 1;
@@ -3456,14 +3517,6 @@ err_exit:
  * Will consider support rest of modes in future.
  *
  */
-enum ADAPTIVE_KEY_MODE {
-	HOME_MODE,
-	WEB_BROWSER_MODE,
-	WEB_CONFERENCE_MODE,
-	FUNCTION_MODE,
-	LAYFLAT_MODE
-};
-
 const int adaptive_keyboard_modes[] = {
 	HOME_MODE,
 /*	WEB_BROWSER_MODE = 2,
Signature · 1 line
2.1.0
#1 lore raw

On Wed, Feb 18, 2015 at 09:53:44PM +0100, Bastien Nocera wrote:

Commit message please.

Quoted 9 lines
---
 drivers/platform/x86/thinkpad_acpi.c | 71 +++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +0 -0
index a6dd017..562d958 100644

...

drivers/platform/x86/thinkpad_acpi.c static void hotkey_wakeup_hotunplug_complete_notify_change(void) · line 2963

Quoted 4 lines
drivers/platform/x86/thinkpad_acpi.c +4 -0
+static struct device_attribute dev_attr_adaptive_kbd_mode =
+	__ATTR(adaptive_kbd_mode, S_IWUSR | S_IRUGO,
+		adaptive_kbd_mode_show, adaptive_kbd_mode_store);
+

Please use DEVICE_ATTR_RW() macros for new sysfs files.

I'd very much like to see a cleanup of the driver to use these as well.

Henrique, your thoughts / preference?

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center
#2 lore raw
Quoted 3 lines · Darren Hart

On Wed, Feb 18, 2015 at 09:53:44PM +0100, Bastien Nocera wrote:

Commit message please.

Added.

Quoted 12 lines
Quoted 9 lines
---
 drivers/platform/x86/thinkpad_acpi.c | 71 +++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +0 -0
index a6dd017..562d958 100644

...

Quoted 6 lines

drivers/platform/x86/thinkpad_acpi.c static void hotkey_wakeup_hotunplug_complete_notify_change(void) · line 2963

Quoted 4 lines
drivers/platform/x86/thinkpad_acpi.c +4 -0
+static struct device_attribute dev_attr_adaptive_kbd_mode =
+	__ATTR(adaptive_kbd_mode, S_IWUSR | S_IRUGO,
+		adaptive_kbd_mode_show, adaptive_kbd_mode_store);
+

Please use DEVICE_ATTR_RW() macros for new sysfs files.

Done.

Quoted 3 lines

I'd very much like to see a cleanup of the driver to use these as well.

Henrique, your thoughts / preference?

Looks easy enough. I'll post the patch with the new series.

#3 lore raw
In reply to Darren Hart
Quoted 23 lines · Darren Hart

On Wed, Feb 18, 2015 at 09:53:44PM +0100, Bastien Nocera wrote:

Commit message please.

Quoted 9 lines
---
 drivers/platform/x86/thinkpad_acpi.c | 71 +++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +0 -0
index a6dd017..562d958 100644

...

drivers/platform/x86/thinkpad_acpi.c static void hotkey_wakeup_hotunplug_complete_notify_change(void) · line 2963

Quoted 4 lines
drivers/platform/x86/thinkpad_acpi.c +4 -0
+static struct device_attribute dev_attr_adaptive_kbd_mode =
+	__ATTR(adaptive_kbd_mode, S_IWUSR | S_IRUGO,
+		adaptive_kbd_mode_show, adaptive_kbd_mode_store);
+

Please use DEVICE_ATTR_RW() macros for new sysfs files.

Quoted 3 lines

I'd very much like to see a cleanup of the driver to use these as well.

Henrique, your thoughts / preference?

Converting to DEVICE_ATTR_RW/RO would be welcome.

Signature · 4 lines
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh
#4 lore raw
Quoted 24 lines · Henrique de Moraes Holschuh
Quoted 23 lines · Darren Hart

On Wed, Feb 18, 2015 at 09:53:44PM +0100, Bastien Nocera wrote:

Commit message please.

Quoted 9 lines
---
 drivers/platform/x86/thinkpad_acpi.c | 71 +++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +0 -0
index a6dd017..562d958 100644

...

drivers/platform/x86/thinkpad_acpi.c static void hotkey_wakeup_hotunplug_complete_notify_change(void) · line 2963

Quoted 4 lines
drivers/platform/x86/thinkpad_acpi.c +4 -0
+static struct device_attribute dev_attr_adaptive_kbd_mode =
+	__ATTR(adaptive_kbd_mode, S_IWUSR | S_IRUGO,
+		adaptive_kbd_mode_show, adaptive_kbd_mode_store);
+

Please use DEVICE_ATTR_RW() macros for new sysfs files.

Quoted 5 lines
Quoted 3 lines

I'd very much like to see a cleanup of the driver to use these as well.

Henrique, your thoughts / preference?

Converting to DEVICE_ATTR_RW/RO would be welcome.

I've already sent the new patch for that though...