Skip to contentSkip to conversation

toshiba_acpi: Change sci_open function return value

PATCH In review Azael Avalos 2 participants 2 messages Jan 14, 2015 – Jan 18, 2015

Subsystems (2)
lore
Share & tools
lore

Azael Avalos

author maintainer
#0 lore raw

PATCH 1/1 toshiba_acpi: Change sci_open function return value

Some Toshiba laptops have "poorly implemented" SCI calls on their BIOSes and are not checking for sci_{open, close} calls, therefore, the sci_open function is failing and making some of the supported features unavailable (kbd backlight, touchpad and illumination).

This patch changes the default return code of the sci_open function to return one instead of zero, making all those faulty laptops load all the supported features.

---
 drivers/platform/x86/toshiba_acpi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/x86/toshiba_acpi.c +2 -1
index fc34a71..71ac7c12 100644
@@ -391,9 +391,10 @@ static int sci_open(struct toshiba_acpi_dev *dev)
 		return 1;
 	} else if (out[0] == TOS_NOT_PRESENT) {
 		pr_info("Toshiba SCI is not present\n");
+		return 0;
 	}
 
-	return 0;
+	return 1;
 }
 
 static void sci_close(struct toshiba_acpi_dev *dev)
Signature · 1 line
2.2.1
#1 lore raw
Quoted 19 lines · Azael Avalos

Some Toshiba laptops have "poorly implemented" SCI calls on their BIOSes and are not checking for sci_{open, close} calls, therefore, the sci_open function is failing and making some of the supported features unavailable (kbd backlight, touchpad and illumination).

This patch changes the default return code of the sci_open function to return one instead of zero, making all those faulty laptops load all the supported features.

---
 drivers/platform/x86/toshiba_acpi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/x86/toshiba_acpi.c +0 -0
index fc34a71..71ac7c12 100644

drivers/platform/x86/toshiba_acpi.c static int sci_open(struct toshiba_acpi_dev *dev) · line 397

Quoted 8 lines
drivers/platform/x86/toshiba_acpi.c +2 -1
@@ -391,9 +391,10 @@ static int sci_open(struct toshiba_acpi_dev *dev)
 		return 1;
 	} else if (out[0] == TOS_NOT_PRESENT) {
 		pr_info("Toshiba SCI is not present\n");
+		return 0;
 	}
 
-	return 0;
+	return 1;

Which means there is really no point in continuing to check for TOS_OPEN_SLOSE_OK or TOS_ALREADY_OPEN since we're going to return 1 anyway. The only thing we care about now is TOS_NOT_PRESENT.

I appreciate coding to what it SHOULD be and then handling corner cases separately, which is basically what this does. However, corner cases need to be documented.

At the very least, please provide a comment block above return 1 explaining why we are ignoring what the previous logic indicates should be a failure.

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center