diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index d0c450dcdffe..c914c9aeec11 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -40,10 +40,6 @@ __FBSDID("$FreeBSD$"); * Asus laptop which doesn't appear to be supported, or strange things happen * when using this driver, please report to . * - * XXX: - * Led support is disabled for the time being because it causes the kernel to - * panic when unloading the module. This is being investigated. - * */ #include "opt_acpi.h" @@ -173,11 +169,9 @@ static int acpi_asus_probe(device_t dev); static int acpi_asus_attach(device_t dev); static int acpi_asus_detach(device_t dev); -#ifdef notyet static void acpi_asus_mled(device_t dev, int state); static void acpi_asus_tled(device_t dev, int state); static void acpi_asus_wled(device_t dev, int state); -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS); @@ -285,7 +279,6 @@ acpi_asus_attach(device_t dev) SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "asus", CTLFLAG_RD, 0, ""); -#ifdef notyet /* Attach leds */ if (sc->model->mled_set) sc->s_mled = led_create((led_t *)acpi_asus_mled, dev, "mled"); @@ -295,7 +288,6 @@ acpi_asus_attach(device_t dev) if (sc->model->wled_set) sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); -#endif /* Attach brightness for GPLV/SPLV models */ if (sc->model->brn_get && @@ -385,7 +377,6 @@ acpi_asus_detach(device_t dev) sc = device_get_softc(dev); -#ifdef notyet /* Turn the lights off */ if (sc->model->mled_set) led_destroy(sc->s_mled); @@ -395,7 +386,6 @@ acpi_asus_detach(device_t dev) if (sc->model->wled_set) led_destroy(sc->s_wled); -#endif /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, @@ -407,7 +397,6 @@ acpi_asus_detach(device_t dev) return (0); } -#ifdef notyet static void acpi_asus_mled(device_t dev, int state) { @@ -467,7 +456,6 @@ acpi_asus_wled(device_t dev, int state) AcpiEvaluateObject(sc->handle, sc->model->wled_set, &Args, NULL); } -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS) diff --git a/sys/i386/acpica/acpi_asus.c b/sys/i386/acpica/acpi_asus.c index d0c450dcdffe..c914c9aeec11 100644 --- a/sys/i386/acpica/acpi_asus.c +++ b/sys/i386/acpica/acpi_asus.c @@ -40,10 +40,6 @@ __FBSDID("$FreeBSD$"); * Asus laptop which doesn't appear to be supported, or strange things happen * when using this driver, please report to . * - * XXX: - * Led support is disabled for the time being because it causes the kernel to - * panic when unloading the module. This is being investigated. - * */ #include "opt_acpi.h" @@ -173,11 +169,9 @@ static int acpi_asus_probe(device_t dev); static int acpi_asus_attach(device_t dev); static int acpi_asus_detach(device_t dev); -#ifdef notyet static void acpi_asus_mled(device_t dev, int state); static void acpi_asus_tled(device_t dev, int state); static void acpi_asus_wled(device_t dev, int state); -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS); @@ -285,7 +279,6 @@ acpi_asus_attach(device_t dev) SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "asus", CTLFLAG_RD, 0, ""); -#ifdef notyet /* Attach leds */ if (sc->model->mled_set) sc->s_mled = led_create((led_t *)acpi_asus_mled, dev, "mled"); @@ -295,7 +288,6 @@ acpi_asus_attach(device_t dev) if (sc->model->wled_set) sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); -#endif /* Attach brightness for GPLV/SPLV models */ if (sc->model->brn_get && @@ -385,7 +377,6 @@ acpi_asus_detach(device_t dev) sc = device_get_softc(dev); -#ifdef notyet /* Turn the lights off */ if (sc->model->mled_set) led_destroy(sc->s_mled); @@ -395,7 +386,6 @@ acpi_asus_detach(device_t dev) if (sc->model->wled_set) led_destroy(sc->s_wled); -#endif /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, @@ -407,7 +397,6 @@ acpi_asus_detach(device_t dev) return (0); } -#ifdef notyet static void acpi_asus_mled(device_t dev, int state) { @@ -467,7 +456,6 @@ acpi_asus_wled(device_t dev, int state) AcpiEvaluateObject(sc->handle, sc->model->wled_set, &Args, NULL); } -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS) diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile index 0609e3192f8a..3d8d3b82937a 100644 --- a/sys/modules/acpi/acpi_asus/Makefile +++ b/sys/modules/acpi/acpi_asus/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../i386/acpica \ - ${.CURDIR}/../../../dev/led +.PATH: ${.CURDIR}/../../../i386/acpica KMOD= acpi_asus CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica -SRCS= acpi_asus.c led.c opt_acpi.h device_if.h bus_if.h +SRCS= acpi_asus.c opt_acpi.h device_if.h bus_if.h .include