eeepc-laptop: Remove uneccesary acpi_disabled check

[mirror_ubuntu-bionic-kernel.git] / drivers / platform / x86 / eeepc-laptop.c

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 4226e535273874fb06aea0344c4c8ce00a8b957c..f5efe8da5e7aab4dcd7b04ad55bd559c90a7a541 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -34,6 +34,7 @@
 #include <linux/rfkill.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
+#include <linux/leds.h>
 
 #define EEEPC_LAPTOP_VERSION   "0.1"
 
@@ -380,7 +381,7 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
        if (rv > 0)
                value = set_acpi(cm, value);
        if (value < 0)
-               return value;
+               return -EIO;
        return rv;
 }
 
@@ -389,11 +390,11 @@ static ssize_t show_sys_acpi(int cm, char *buf)
        int value = get_acpi(cm);
 
        if (value < 0)
-               return value;
+               return -EIO;
        return sprintf(buf, "%d\n", value);
 }
 
-#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm)                           \
+#define EEEPC_CREATE_DEVICE_ATTR(_name, _mode, _cm)                    \
        static ssize_t show_##_name(struct device *dev,                 \
                                    struct device_attribute *attr,      \
                                    char *buf)                          \
@@ -409,14 +410,14 @@ static ssize_t show_sys_acpi(int cm, char *buf)
        static struct device_attribute dev_attr_##_name = {             \
                .attr = {                                               \
                        .name = __stringify(_name),                     \
-                       .mode = 0644 },                                 \
+                       .mode = _mode },                                \
                .show   = show_##_name,                                 \
                .store  = store_##_name,                                \
        }
 
-EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA);
-EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER);
-EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH);
+EEEPC_CREATE_DEVICE_ATTR(camera, 0644, CM_ASL_CAMERA);
+EEEPC_CREATE_DEVICE_ATTR(cardr, 0644, CM_ASL_CARDREADER);
+EEEPC_CREATE_DEVICE_ATTR(disp, 0200, CM_ASL_DISPLAYSWITCH);
 
 struct eeepc_cpufv {
        int num;
@@ -506,6 +507,39 @@ static struct attribute_group platform_attribute_group = {
        .attrs = platform_attributes
 };
 
+/*
+ * LEDs
+ */
+/*
+ * These functions actually update the LED's, and are called from a
+ * workqueue. By doing this as separate work rather than when the LED
+ * subsystem asks, we avoid messing with the Asus ACPI stuff during a
+ * potentially bad time, such as a timer interrupt.
+ */
+static int tpd_led_wk;
+
+static void tpd_led_update(struct work_struct *ignored)
+{
+       int value = tpd_led_wk;
+       set_acpi(CM_ASL_TPD, value);
+}
+
+static struct workqueue_struct *led_workqueue;
+static DECLARE_WORK(tpd_led_work, tpd_led_update);
+
+static void tpd_led_set(struct led_classdev *led_cdev,
+                       enum led_brightness value)
+{
+       tpd_led_wk = (value > 0) ? 1 : 0;
+       queue_work(led_workqueue, &tpd_led_work);
+}
+
+static struct led_classdev tpd_led = {
+       .name           = "eeepc::touchpad",
+       .brightness_set = tpd_led_set,
+       .max_brightness = 1
+};
+
 /*
  * Hotkey functions
  */
@@ -1034,6 +1068,14 @@ static void eeepc_hwmon_exit(void)
        eeepc_hwmon_device = NULL;
 }
 
+static void eeepc_led_exit(void)
+{
+       if (led_workqueue)
+               destroy_workqueue(led_workqueue);
+       if (tpd_led.dev)
+               led_classdev_unregister(&tpd_led);
+}
+
 static int eeepc_new_rfkill(struct rfkill **rfkill,
                            const char *name, struct device *dev,
                            enum rfkill_type type, int cm)
@@ -1190,13 +1232,29 @@ static int eeepc_input_init(struct device *dev)
        return 0;
 }
 
+static int eeepc_led_init(struct device *dev)
+{
+       int rv;
+
+       if (get_acpi(CM_ASL_TPD) == -ENODEV)
+               return 0;
+
+       rv = led_classdev_register(dev, &tpd_led);
+       if (rv)
+               return rv;
+
+       led_workqueue = create_singlethread_workqueue("led_workqueue");
+       if (!led_workqueue)
+               return -ENOMEM;
+
+       return 0;
+}
+
 static int __devinit eeepc_hotk_add(struct acpi_device *device)
 {
        struct device *dev;
        int result;
 
-       if (!device)
-               return -EINVAL;
        pr_notice(EEEPC_HOTK_NAME "\n");
        ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
        if (!ehotk)
@@ -1248,6 +1306,10 @@ static int __devinit eeepc_hotk_add(struct acpi_device *device)
        if (result)
                goto fail_hwmon;
 
+       result = eeepc_led_init(dev);
+       if (result)
+               goto fail_led;
+
        result = eeepc_rfkill_init(dev);
        if (result)
                goto fail_rfkill;
@@ -1255,6 +1317,8 @@ static int __devinit eeepc_hotk_add(struct acpi_device *device)
        return 0;
 
 fail_rfkill:
+       eeepc_led_exit();
+fail_led:
        eeepc_hwmon_exit();
 fail_hwmon:
        eeepc_input_exit();
@@ -1277,13 +1341,11 @@ fail_platform_driver:
 
 static int eeepc_hotk_remove(struct acpi_device *device, int type)
 {
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
-
        eeepc_backlight_exit();
        eeepc_rfkill_exit();
        eeepc_input_exit();
        eeepc_hwmon_exit();
+       eeepc_led_exit();
        sysfs_remove_group(&platform_device->dev.kobj,
                           &platform_attribute_group);
        platform_device_unregister(platform_device);
@@ -1297,8 +1359,6 @@ static int __init eeepc_laptop_init(void)
 {
        int result;
 
-       if (acpi_disabled)
-               return -ENODEV;
        result = acpi_bus_register_driver(&eeepc_hotk_driver);
        if (result < 0)
                return result;