[Midnightbsd-cvs] src [7291] trunk/sys/dev/acpi_support/acpi_toshiba.c: fix some of the weird logic

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 4 17:23:03 EDT 2015


Revision: 7291
          http://svnweb.midnightbsd.org/src/?rev=7291
Author:   laffer1
Date:     2015-09-04 17:23:03 -0400 (Fri, 04 Sep 2015)
Log Message:
-----------
fix some of the weird logic

Modified Paths:
--------------
    trunk/sys/dev/acpi_support/acpi_toshiba.c

Modified: trunk/sys/dev/acpi_support/acpi_toshiba.c
===================================================================
--- trunk/sys/dev/acpi_support/acpi_toshiba.c	2015-08-30 18:27:57 UTC (rev 7290)
+++ trunk/sys/dev/acpi_support/acpi_toshiba.c	2015-09-04 21:23:03 UTC (rev 7291)
@@ -172,7 +172,7 @@
 	DEVMETHOD(device_attach,	acpi_toshiba_attach),
 	DEVMETHOD(device_detach,	acpi_toshiba_detach),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t acpi_toshiba_driver = {
@@ -190,7 +190,7 @@
 	DEVMETHOD(device_probe,		acpi_toshiba_video_probe),
 	DEVMETHOD(device_attach,	acpi_toshiba_video_attach),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t acpi_toshiba_video_driver = {
@@ -324,7 +324,7 @@
 
 	ACPI_SERIAL_ASSERT(toshiba);
 	if (op == HCI_SET) {
-		if (*state < 0 || *state > 1)
+		if (*state > 1)
 			return (EINVAL);
 		*state <<= HCI_FAN_SHIFT;
 	}
@@ -368,7 +368,7 @@
 
 	ACPI_SERIAL_ASSERT(toshiba);
 	if (op == HCI_SET) {
-		if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX)
+		if (*brightness > HCI_LCD_BRIGHTNESS_MAX)
 			return (EINVAL);
 		*brightness <<= HCI_LCD_BRIGHTNESS_SHIFT;
 	}
@@ -384,7 +384,7 @@
 
 	ACPI_SERIAL_ASSERT(toshiba);
 	if (op == HCI_SET) {
-		if (*backlight < 0 || *backlight > 1)
+		if (*backlight > 1)
 			return (EINVAL);
 	}
 	return (hci_call(h, op, HCI_REG_LCD_BACKLIGHT, backlight));
@@ -397,7 +397,7 @@
 
 	ACPI_SERIAL_ASSERT(toshiba);
 	if (op == HCI_SET) {
-		if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX)
+		if (*speed > HCI_CPU_SPEED_MAX)
 			return (EINVAL);
 		*speed <<= HCI_CPU_SPEED_SHIFT;
 	}



More information about the Midnightbsd-cvs mailing list