Skip to contentSkip to conversation

toshiba_acpi: Fix USB Sleep & Charge mode and documentation updates

PATCH Superseded Azael Avalos 2 participants 7 messages Mar 27, 2015 – Mar 30, 2015

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Azael Avalos

author maintainer
#0 lore raw

cover toshiba_acpi: Fix USB Sleep & Charge mode and documentation updates

This patch fixes the USB Sleep & Charge charging mode on certain models, fixes some typos in pr_* messages and also adds the missing entries in the documentation file.

Azael Avalos (3):
toshiba_acpi: Update and fix USB Sleep and Charge modes
toshiba_acpi: Fix typos in pr_* messages from USB Fleep Functions Documentation/ABI: Update sysfs-driver-toshiba_acpi entry

 .../ABI/testing/sysfs-driver-toshiba_acpi          | 93 +++++++++++++++++++---
 drivers/platform/x86/toshiba_acpi.c                | 77 ++++++++++++++----
 2 files changed, 140 insertions(+), 30 deletions(-)
Signature · 1 line
2.2.2
author maintainer
#1 lore raw

PATCH 1/3 toshiba_acpi: Update and fix USB Sleep and Charge modes

This patch fixes the USB Sleep and Charge mode on certain models where the value returned by the BIOS is different, and thus, making this feature not to work for those models.

Also, the "Typical" charging mode was added as a supported mode.

---
 drivers/platform/x86/toshiba_acpi.c | 61 +++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 9 deletions(-)
drivers/platform/x86/toshiba_acpi.c +52 -9
index 17a259e..595f12c 100644
@@ -150,9 +150,10 @@ MODULE_LICENSE("GPL");
 #define SCI_KBD_MODE_OFF		0x10
 #define SCI_KBD_TIME_MAX		0x3c001a
 #define SCI_USB_CHARGE_MODE_MASK	0xff
-#define SCI_USB_CHARGE_DISABLED		0x30000
-#define SCI_USB_CHARGE_ALTERNATE	0x30009
-#define SCI_USB_CHARGE_AUTO		0x30021
+#define SCI_USB_CHARGE_DISABLED		0x00
+#define SCI_USB_CHARGE_ALTERNATE	0x09
+#define SCI_USB_CHARGE_TYPICAL		0x11
+#define SCI_USB_CHARGE_AUTO		0x21
 #define SCI_USB_CHARGE_BAT_MASK		0x7
 #define SCI_USB_CHARGE_BAT_LVL_OFF	0x1
 #define SCI_USB_CHARGE_BAT_LVL_ON	0x4
@@ -177,6 +178,7 @@ struct toshiba_acpi_dev {
 	int kbd_mode;
 	int kbd_time;
 	int usbsc_bat_level;
+	int usbsc_mode_base;
 	int hotkey_event_type;
 
 	unsigned int illumination_supported:1;
@@ -800,6 +802,44 @@ static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev,
 }
 
 /* Sleep (Charge and Music) utilities support */
+static void toshiba_usb_sleep_charge_available(struct toshiba_acpi_dev *dev)
+{
+	u32 in[TCI_WORDS] = { SCI_GET, SCI_USB_SLEEP_CHARGE, 0, 0, 0, 0 };
+	u32 out[TCI_WORDS];
+	acpi_status status;
+
+	if (!sci_open(dev))
+		return;
+
+	status = tci_raw(dev, in, out);
+	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+		pr_err("ACPI call to get USB S&C mode failed\n");
+		sci_close(dev);
+		return;
+	} else if (out[0] == TOS_NOT_SUPPORTED) {
+		pr_info("USB Sleep and Charge not supported\n");
+		sci_close(dev);
+		return;
+	}
+	dev->usbsc_mode_base = out[4];
+
+	in[5] = SCI_USB_CHARGE_BAT_LVL;
+	status = tci_raw(dev, in, out);
+	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+		pr_err("ACPI call to get USB S&C battery level failed\n");
+		sci_close(dev);
+		return;
+	} else if (out[0] == TOS_NOT_SUPPORTED) {
+		pr_info("USB Sleep and Charge not supported\n");
+		sci_close(dev);
+		return;
+	}
+	dev->usbsc_bat_level = out[2];
+	dev->usb_sleep_charge_supported = 1;
+
+	sci_close(dev);
+}
+
 static int toshiba_usb_sleep_charge_get(struct toshiba_acpi_dev *dev,
 					u32 *mode)
 {
@@ -1976,17 +2016,21 @@ static ssize_t usb_sleep_charge_store(struct device *dev,
 	 * 0 - Disabled
 	 * 1 - Alternate (Non USB conformant devices that require more power)
 	 * 2 - Auto (USB conformant devices)
+	 * 3 - Typical
 	 */
-	if (state != 0 && state != 1 && state != 2)
+	if (state != 0 && state != 1 && state != 2 && state != 3)
 		return -EINVAL;
 
 	/* Set the USB charging mode to internal value */
+	mode = toshiba->usbsc_mode_base;
 	if (state == 0)
-		mode = SCI_USB_CHARGE_DISABLED;
+		mode |= SCI_USB_CHARGE_DISABLED;
 	else if (state == 1)
-		mode = SCI_USB_CHARGE_ALTERNATE;
+		mode |= SCI_USB_CHARGE_ALTERNATE;
 	else if (state == 2)
-		mode = SCI_USB_CHARGE_AUTO;
+		mode |= SCI_USB_CHARGE_AUTO;
+	else if (state == 3)
+		mode |= SCI_USB_CHARGE_TYPICAL;
 
 	ret = toshiba_usb_sleep_charge_set(toshiba, mode);
 	if (ret)
@@ -2756,8 +2800,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
 	ret = toshiba_accelerometer_supported(dev);
 	dev->accelerometer_supported = !ret;
 
-	ret = toshiba_usb_sleep_charge_get(dev, &dummy);
-	dev->usb_sleep_charge_supported = !ret;
+	toshiba_usb_sleep_charge_available(dev);
 
 	ret = toshiba_usb_rapid_charge_get(dev, &dummy);
 	dev->usb_rapid_charge_supported = !ret;
Signature · 1 line
2.2.2
#2 lore raw

Re: [PATCH 1/3] toshiba_acpi: Update and fix USB Sleep and Charge modes

Quoted 5 lines · Azael Avalos

This patch fixes the USB Sleep and Charge mode on certain models where the value returned by the BIOS is different, and thus, making this feature not to work for those models.

Also, the "Typical" charging mode was added as a supported mode.

What does typical mean?

Quoted 35 lines
---
 drivers/platform/x86/toshiba_acpi.c | 61 +++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 9 deletions(-)
drivers/platform/x86/toshiba_acpi.c +5 -3
index 17a259e..595f12c 100644
@@ -150,9 +150,10 @@ MODULE_LICENSE("GPL");
 #define SCI_KBD_MODE_OFF		0x10
 #define SCI_KBD_TIME_MAX		0x3c001a
 #define SCI_USB_CHARGE_MODE_MASK	0xff
-#define SCI_USB_CHARGE_DISABLED		0x30000
-#define SCI_USB_CHARGE_ALTERNATE	0x30009
-#define SCI_USB_CHARGE_AUTO		0x30021
+#define SCI_USB_CHARGE_DISABLED		0x00
+#define SCI_USB_CHARGE_ALTERNATE	0x09
+#define SCI_USB_CHARGE_TYPICAL		0x11
+#define SCI_USB_CHARGE_AUTO		0x21
 #define SCI_USB_CHARGE_BAT_MASK		0x7
 #define SCI_USB_CHARGE_BAT_LVL_OFF	0x1
 #define SCI_USB_CHARGE_BAT_LVL_ON	0x4
@@ -177,6 +178,7 @@ struct toshiba_acpi_dev {
 	int kbd_mode;
 	int kbd_time;
 	int usbsc_bat_level;
+	int usbsc_mode_base;
 	int hotkey_event_type;
 
 	unsigned int illumination_supported:1;
@@ -800,6 +802,44 @@ static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev,
 }
 

drivers/platform/x86/toshiba_acpi.c static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev, · line 813

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +9 -0
 /* Sleep (Charge and Music) utilities support */
+static void toshiba_usb_sleep_charge_available(struct toshiba_acpi_dev *dev)
+{
+	u32 in[TCI_WORDS] = { SCI_GET, SCI_USB_SLEEP_CHARGE, 0, 0, 0, 0 };
+	u32 out[TCI_WORDS];
+	acpi_status status;
+
+	if (!sci_open(dev))
+		return;
+

Hrm, might be a good idea to set usb_sleep_charge_supported to 0 first so if we error out here, it is disabled.

Quoted 6 lines
drivers/platform/x86/toshiba_acpi.c +6 -0
+	status = tci_raw(dev, in, out);
+	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+		pr_err("ACPI call to get USB S&C mode failed\n");
+		sci_close(dev);
+		return;
+	} else if (out[0] == TOS_NOT_SUPPORTED) {

drivers/platform/x86/toshiba_acpi.c static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev, · line 829

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +10 -0
+		pr_info("USB Sleep and Charge not supported\n");
+		sci_close(dev);
+		return;
+	}
+	dev->usbsc_mode_base = out[4];
+
+	in[5] = SCI_USB_CHARGE_BAT_LVL;
+	status = tci_raw(dev, in, out);
+	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+		pr_err("ACPI call to get USB S&C battery level failed\n");

Sleep and Charge here too please. This keeps it consistent with the other messages as well as explicit for those who may not map S&C to Sleep and Charge.

Quoted 43 lines
drivers/platform/x86/toshiba_acpi.c +21 -4
+		sci_close(dev);
+		return;
+	} else if (out[0] == TOS_NOT_SUPPORTED) {
+		pr_info("USB Sleep and Charge not supported\n");
+		sci_close(dev);
+		return;
+	}
+	dev->usbsc_bat_level = out[2];
+	dev->usb_sleep_charge_supported = 1;
+
+	sci_close(dev);
+}
+
 static int toshiba_usb_sleep_charge_get(struct toshiba_acpi_dev *dev,
 					u32 *mode)
 {
@@ -1976,17 +2016,21 @@ static ssize_t usb_sleep_charge_store(struct device *dev,
 	 * 0 - Disabled
 	 * 1 - Alternate (Non USB conformant devices that require more power)
 	 * 2 - Auto (USB conformant devices)
+	 * 3 - Typical
 	 */
-	if (state != 0 && state != 1 && state != 2)
+	if (state != 0 && state != 1 && state != 2 && state != 3)
 		return -EINVAL;
 
 	/* Set the USB charging mode to internal value */
+	mode = toshiba->usbsc_mode_base;
 	if (state == 0)
-		mode = SCI_USB_CHARGE_DISABLED;
+		mode |= SCI_USB_CHARGE_DISABLED;
 	else if (state == 1)
-		mode = SCI_USB_CHARGE_ALTERNATE;
+		mode |= SCI_USB_CHARGE_ALTERNATE;
 	else if (state == 2)
-		mode = SCI_USB_CHARGE_AUTO;
+		mode |= SCI_USB_CHARGE_AUTO;
+	else if (state == 3)
+		mode |= SCI_USB_CHARGE_TYPICAL;
 
 	ret = toshiba_usb_sleep_charge_set(toshiba, mode);
 	if (ret)

drivers/platform/x86/toshiba_acpi.c static int toshiba_acpi_add(struct acpi_device *acpi_dev) · line 2806

Quoted 9 lines
drivers/platform/x86/toshiba_acpi.c +1 -2
@@ -2756,8 +2800,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
 	ret = toshiba_accelerometer_supported(dev);
 	dev->accelerometer_supported = !ret;
 
-	ret = toshiba_usb_sleep_charge_get(dev, &dummy);
-	dev->usb_sleep_charge_supported = !ret;
+	toshiba_usb_sleep_charge_available(dev);
 
 	ret = toshiba_usb_rapid_charge_get(dev, &dummy);
 	dev->usb_rapid_charge_supported = !ret;

The rest looks good.

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

Re: [PATCH 1/3] toshiba_acpi: Update and fix USB Sleep and Charge modes

Hi Darren,

2015-03-27 20:53 GMT-06:00 Darren Hart <[email protected]>:

Quoted 8 lines · Azael Avalos
Quoted 5 lines

This patch fixes the USB Sleep and Charge mode on certain models where the value returned by the BIOS is different, and thus, making this feature not to work for those models.

Also, the "Typical" charging mode was added as a supported mode.

What does typical mean?

Can't really help you here :-(

Toshiba does not provide specifics as to what each mode does or represent, they simply state that if one mode does not work, try another...

There are more charging modes but I will add them as soon as I find their values, the following list the charging modes currently not known.

- Mode 1
- Mode 2
- Tablet

One can infer what the "Tablet" mode does, but as for the rest...

Quoted 36 lines
Quoted 36 lines
---
 drivers/platform/x86/toshiba_acpi.c | 61 +++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 9 deletions(-)
drivers/platform/x86/toshiba_acpi.c +5 -3
index 17a259e..595f12c 100644
@@ -150,9 +150,10 @@ MODULE_LICENSE("GPL");
 #define SCI_KBD_MODE_OFF             0x10
 #define SCI_KBD_TIME_MAX             0x3c001a
 #define SCI_USB_CHARGE_MODE_MASK     0xff
-#define SCI_USB_CHARGE_DISABLED              0x30000
-#define SCI_USB_CHARGE_ALTERNATE     0x30009
-#define SCI_USB_CHARGE_AUTO          0x30021
+#define SCI_USB_CHARGE_DISABLED              0x00
+#define SCI_USB_CHARGE_ALTERNATE     0x09
+#define SCI_USB_CHARGE_TYPICAL               0x11
+#define SCI_USB_CHARGE_AUTO          0x21
 #define SCI_USB_CHARGE_BAT_MASK              0x7
 #define SCI_USB_CHARGE_BAT_LVL_OFF   0x1
 #define SCI_USB_CHARGE_BAT_LVL_ON    0x4
@@ -177,6 +178,7 @@ struct toshiba_acpi_dev {
      int kbd_mode;
      int kbd_time;
      int usbsc_bat_level;
+     int usbsc_mode_base;
      int hotkey_event_type;
 
      unsigned int illumination_supported:1;
@@ -800,6 +802,44 @@ static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev,
 }
 
Quoted 13 lines

drivers/platform/x86/toshiba_acpi.c static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev, · line 813

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +9 -0
 /* Sleep (Charge and Music) utilities support */
+static void toshiba_usb_sleep_charge_available(struct toshiba_acpi_dev *dev)
+{
+     u32 in[TCI_WORDS] = { SCI_GET, SCI_USB_SLEEP_CHARGE, 0, 0, 0, 0 };
+     u32 out[TCI_WORDS];
+     acpi_status status;
+
+     if (!sci_open(dev))
+             return;
+

Hrm, might be a good idea to set usb_sleep_charge_supported to 0 first so if we error out here, it is disabled.

Ok, will do in v2.

Quoted 18 lines
Quoted 7 lines
drivers/platform/x86/toshiba_acpi.c +6 -0
+     status = tci_raw(dev, in, out);
+     if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+             pr_err("ACPI call to get USB S&C mode failed\n");
+             sci_close(dev);
+             return;
+     } else if (out[0] == TOS_NOT_SUPPORTED) {

drivers/platform/x86/toshiba_acpi.c static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev, · line 829

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +10 -0
+             pr_info("USB Sleep and Charge not supported\n");
+             sci_close(dev);
+             return;
+     }
+     dev->usbsc_mode_base = out[4];
+
+     in[5] = SCI_USB_CHARGE_BAT_LVL;
+     status = tci_raw(dev, in, out);
+     if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+             pr_err("ACPI call to get USB S&C battery level failed\n");
Quoted 2 lines

Sleep and Charge here too please. This keeps it consistent with the other messages as well as explicit for those who may not map S&C to Sleep and Charge.

Ok, will do in v2.

Quoted 51 lines
Quoted 51 lines
drivers/platform/x86/toshiba_acpi.c +22 -6
+             sci_close(dev);
+             return;
+     } else if (out[0] == TOS_NOT_SUPPORTED) {
+             pr_info("USB Sleep and Charge not supported\n");
+             sci_close(dev);
+             return;
+     }
+     dev->usbsc_bat_level = out[2];
+     dev->usb_sleep_charge_supported = 1;
+
+     sci_close(dev);
+}
+
 static int toshiba_usb_sleep_charge_get(struct toshiba_acpi_dev *dev,
                                      u32 *mode)
 {
@@ -1976,17 +2016,21 @@ static ssize_t usb_sleep_charge_store(struct device *dev,
       * 0 - Disabled
       * 1 - Alternate (Non USB conformant devices that require more power)
       * 2 - Auto (USB conformant devices)
+      * 3 - Typical
       */
-     if (state != 0 && state != 1 && state != 2)
+     if (state != 0 && state != 1 && state != 2 && state != 3)
              return -EINVAL;
 
      /* Set the USB charging mode to internal value */
+     mode = toshiba->usbsc_mode_base;
      if (state == 0)
-             mode = SCI_USB_CHARGE_DISABLED;
+             mode |= SCI_USB_CHARGE_DISABLED;
      else if (state == 1)
-             mode = SCI_USB_CHARGE_ALTERNATE;
+             mode |= SCI_USB_CHARGE_ALTERNATE;
      else if (state == 2)
-             mode = SCI_USB_CHARGE_AUTO;
+             mode |= SCI_USB_CHARGE_AUTO;
+     else if (state == 3)
+             mode |= SCI_USB_CHARGE_TYPICAL;
 
      ret = toshiba_usb_sleep_charge_set(toshiba, mode);
      if (ret)
@@ -2756,8 +2800,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
      ret = toshiba_accelerometer_supported(dev);
      dev->accelerometer_supported = !ret;
 
-     ret = toshiba_usb_sleep_charge_get(dev, &dummy);
-     dev->usb_sleep_charge_supported = !ret;
+     toshiba_usb_sleep_charge_available(dev);
 
Quoted 8 lines

drivers/platform/x86/toshiba_acpi.c static int toshiba_acpi_add(struct acpi_device *acpi_dev) · line 2806

Quoted 2 lines
drivers/platform/x86/toshiba_acpi.c +0 -0
      ret = toshiba_usb_rapid_charge_get(dev, &dummy);
      dev->usb_rapid_charge_supported = !ret;

The rest looks good.

--
Darren Hart
Intel Open Source Technology Center

Cheers
Azael

Signature · 1 line
-- El mundo apesta y vosotros apestais tambien --
author maintainer
#4 lore raw

PATCH 2/3 toshiba_acpi: Fix typos in pr_* messages from USB Fleep Functions

In reply to Azael Avalos

This patch fixes typos in the pr_* messages from the USB Sleep Functions.

---
 drivers/platform/x86/toshiba_acpi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/platform/x86/toshiba_acpi.c +8 -8
index 595f12c..3bb456c 100644
@@ -955,11 +955,11 @@ static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev,
 	status = tci_raw(dev, in, out);
 	sci_close(dev);
 	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
-		pr_err("ACPI call to get USB S&C battery level failed\n");
+		pr_err("ACPI call to get USB Rapid Charge failed\n");
 		return -EIO;
 	} else if (out[0] == TOS_NOT_SUPPORTED ||
 		   out[0] == TOS_INPUT_DATA_ERROR) {
-		pr_info("USB Sleep and Charge not supported\n");
+		pr_info("USB Rapid Charge not supported\n");
 		return -ENODEV;
 	}
 
@@ -983,10 +983,10 @@ static int toshiba_usb_rapid_charge_set(struct toshiba_acpi_dev *dev,
 	status = tci_raw(dev, in, out);
 	sci_close(dev);
 	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
-		pr_err("ACPI call to set USB S&C battery level failed\n");
+		pr_err("ACPI call to set USB Rapid Charge failed\n");
 		return -EIO;
 	} else if (out[0] == TOS_NOT_SUPPORTED) {
-		pr_info("USB Sleep and Charge not supported\n");
+		pr_info("USB Rapid Charge not supported\n");
 		return -ENODEV;
 	} else if (out[0] == TOS_INPUT_DATA_ERROR) {
 		return -EIO;
@@ -1005,10 +1005,10 @@ static int toshiba_usb_sleep_music_get(struct toshiba_acpi_dev *dev, u32 *state)
 	result = sci_read(dev, SCI_USB_SLEEP_MUSIC, state);
 	sci_close(dev);
 	if (result == TOS_FAILURE) {
-		pr_err("ACPI call to set USB S&C mode failed\n");
+		pr_err("ACPI call to set Sleep and Music mode failed\n");
 		return -EIO;
 	} else if (result == TOS_NOT_SUPPORTED) {
-		pr_info("USB Sleep and Charge not supported\n");
+		pr_info("Sleep and Music not supported\n");
 		return -ENODEV;
 	} else if (result == TOS_INPUT_DATA_ERROR) {
 		return -EIO;
@@ -1027,10 +1027,10 @@ static int toshiba_usb_sleep_music_set(struct toshiba_acpi_dev *dev, u32 state)
 	result = sci_write(dev, SCI_USB_SLEEP_MUSIC, state);
 	sci_close(dev);
 	if (result == TOS_FAILURE) {
-		pr_err("ACPI call to set USB S&C mode failed\n");
+		pr_err("ACPI call to set Sleep and Music mode failed\n");
 		return -EIO;
 	} else if (result == TOS_NOT_SUPPORTED) {
-		pr_info("USB Sleep and Charge not supported\n");
+		pr_info("Sleep and Music not supported\n");
 		return -ENODEV;
 	} else if (result == TOS_INPUT_DATA_ERROR) {
 		return -EIO;
Signature · 1 line
2.2.2
#5 lore raw

Re: [PATCH 2/3] toshiba_acpi: Fix typos in pr_* messages from USB Fleep Functions

Quoted 13 lines · Azael Avalos

This patch fixes typos in the pr_* messages from the USB Sleep Functions.

---
 drivers/platform/x86/toshiba_acpi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/platform/x86/toshiba_acpi.c +0 -0
index 595f12c..3bb456c 100644

drivers/platform/x86/toshiba_acpi.c static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev, · line 962

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +2 -2
@@ -955,11 +955,11 @@ static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev,
 	status = tci_raw(dev, in, out);
 	sci_close(dev);
 	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
-		pr_err("ACPI call to get USB S&C battery level failed\n");
+		pr_err("ACPI call to get USB Rapid Charge failed\n");
 		return -EIO;
 	} else if (out[0] == TOS_NOT_SUPPORTED ||
 		   out[0] == TOS_INPUT_DATA_ERROR) {
-		pr_info("USB Sleep and Charge not supported\n");
+		pr_info("USB Rapid Charge not supported\n");

This is a name change, not a typo fix. You added a comment in 1/3 using Sleep and Charge, should this patch perhaps come first?

Or... hrm... this is using the correct name for each state, and 1/3 added Sleep and Charge to the correct one... right, probably just need a better commit message. Not a type, but fixing the messages reporting the wrong states.

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center
author maintainer
#6 lore raw

Re: [PATCH 2/3] toshiba_acpi: Fix typos in pr_* messages from USB Fleep Functions

Hi Darren,

2015-03-27 20:58 GMT-06:00 Darren Hart <[email protected]>:

Quoted 28 lines · Azael Avalos
Quoted 13 lines

This patch fixes typos in the pr_* messages from the USB Sleep Functions.

---
 drivers/platform/x86/toshiba_acpi.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/platform/x86/toshiba_acpi.c +0 -0
index 595f12c..3bb456c 100644

drivers/platform/x86/toshiba_acpi.c static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev, · line 962

Quoted 10 lines
drivers/platform/x86/toshiba_acpi.c +2 -2
@@ -955,11 +955,11 @@ static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev,
      status = tci_raw(dev, in, out);
      sci_close(dev);
      if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
-             pr_err("ACPI call to get USB S&C battery level failed\n");
+             pr_err("ACPI call to get USB Rapid Charge failed\n");
              return -EIO;
      } else if (out[0] == TOS_NOT_SUPPORTED ||
                 out[0] == TOS_INPUT_DATA_ERROR) {
-             pr_info("USB Sleep and Charge not supported\n");
+             pr_info("USB Rapid Charge not supported\n");

This is a name change, not a typo fix. You added a comment in 1/3 using Sleep and Charge, should this patch perhaps come first?

Quoted 3 lines

Or... hrm... this is using the correct name for each state, and 1/3 added Sleep and Charge to the correct one... right, probably just need a better commit message. Not a type, but fixing the messages reporting the wrong states.

Ok, will change in v2 and resend in a few minutes.

Quoted 4 lines

--
Darren Hart
Intel Open Source Technology Center

Cheers
Azael

Signature · 1 line
-- El mundo apesta y vosotros apestais tambien --