1 files changed, 77 insertions, 50 deletions

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c9784705f6ac..5ea6c3477d17 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -22,6 +22,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -46,12 +48,6 @@ MODULE_AUTHOR("Carlos Corbacho");
 MODULE_DESCRIPTION("Acer Laptop WMI Extras Driver");
 MODULE_LICENSE("GPL");
 
-#define ACER_LOGPREFIX "acer-wmi: "
-#define ACER_ERR KERN_ERR ACER_LOGPREFIX
-#define ACER_NOTICE KERN_NOTICE ACER_LOGPREFIX
-#define ACER_INFO KERN_INFO ACER_LOGPREFIX
-#define ACER_WARNING KERN_WARNING ACER_LOGPREFIX
-
 /*
  * Magic Number
  * Meaning is unknown - this number is required for writing to ACPI for AMW0
@@ -84,7 +80,7 @@ MODULE_LICENSE("GPL");
 #define AMW0_GUID1              "67C3371D-95A3-4C37-BB61-DD47B491DAAB"
 #define AMW0_GUID2              "431F16ED-0C2B-444C-B267-27DEB140CF9C"
 #define WMID_GUID1              "6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3"
-#define WMID_GUID2              "95764E09-FB56-4e83-B31A-37761F60994A"
+#define WMID_GUID2              "95764E09-FB56-4E83-B31A-37761F60994A"
 #define WMID_GUID3              "61EF69EA-865C-4BC3-A502-A0DEBA0CB531"
 
 /*
@@ -93,7 +89,7 @@ MODULE_LICENSE("GPL");
 #define ACERWMID_EVENT_GUID "676AA15E-6A47-4D9F-A2CC-1E6D18D14026"
 
 MODULE_ALIAS("wmi:67C3371D-95A3-4C37-BB61-DD47B491DAAB");
-MODULE_ALIAS("wmi:6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3");
+MODULE_ALIAS("wmi:6AF4F258-B401-42Fd-BE91-3D4AC2D7C0D3");
 MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");
 
 enum acer_wmi_event_ids {
@@ -108,7 +104,7 @@ static const struct key_entry acer_wmi_keymap[] = {
         {KE_KEY, 0x23, {KEY_PROG3} },    /* P_Key */
         {KE_KEY, 0x24, {KEY_PROG4} },    /* Social networking_Key */
         {KE_KEY, 0x64, {KEY_SWITCHVIDEOMODE} }, /* Display Switch */
-        {KE_KEY, 0x82, {KEY_F22} },      /* Touch Pad On/Off */
+        {KE_KEY, 0x82, {KEY_TOUCHPAD_TOGGLE} }, /* Touch Pad On/Off */
         {KE_END, 0}
 };
 
@@ -221,6 +217,7 @@ struct acer_debug {
 static struct rfkill *wireless_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *threeg_rfkill;
+static bool rfkill_inited;
 
 /* Each low-level interface must define at least some of the following */
 struct wmi_interface {
@@ -845,7 +842,7 @@ static void type_aa_dmi_decode(const struct dmi_header *header, void *dummy)
         has_type_aa = true;
         type_aa = (struct hotkey_function_type_aa *) header;
 
-        printk(ACER_INFO "Function bitmap for Communication Button: 0x%x\n",
+        pr_info("Function bitmap for Communication Button: 0x%x\n",
                 type_aa->commun_func_bitmap);
 
         if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_WIRELESS)
@@ -991,6 +988,7 @@ static int __devinit acer_led_init(struct device *dev)
 
 static void acer_led_exit(void)
 {
+        set_u32(LED_OFF, ACER_CAP_MAILLED);
         led_classdev_unregister(&mail_led);
 }
 
@@ -1036,7 +1034,7 @@ static int __devinit acer_backlight_init(struct device *dev)
         bd = backlight_device_register("acer-wmi", dev, NULL, &acer_bl_ops,
                                        &props);
         if (IS_ERR(bd)) {
-                printk(ACER_ERR "Could not register Acer backlight device\n");
+                pr_err("Could not register Acer backlight device\n");
                 acer_backlight_device = NULL;
                 return PTR_ERR(bd);
         }
@@ -1083,8 +1081,7 @@ static acpi_status wmid3_get_device_status(u32 *value, u16 device)
                 return AE_ERROR;
         }
         if (obj->buffer.length != 8) {
-                printk(ACER_WARNING "Unknown buffer length %d\n",
-                        obj->buffer.length);
+                pr_warning("Unknown buffer length %d\n", obj->buffer.length);
                 kfree(obj);
                 return AE_ERROR;
         }
@@ -1093,7 +1090,7 @@ static acpi_status wmid3_get_device_status(u32 *value, u16 device)
         kfree(obj);
 
         if (return_value.error_code || return_value.ec_return_value)
-                printk(ACER_WARNING "Get Device Status failed: "
+                pr_warning("Get Device Status failed: "
                         "0x%x - 0x%x\n", return_value.error_code,
                         return_value.ec_return_value);
         else
@@ -1161,9 +1158,13 @@ static int acer_rfkill_set(void *data, bool blocked)
 {
         acpi_status status;
         u32 cap = (unsigned long)data;
-        status = set_u32(!blocked, cap);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
+
+        if (rfkill_inited) {
+                status = set_u32(!blocked, cap);
+                if (ACPI_FAILURE(status))
+                        return -ENODEV;
+        }
+
         return 0;
 }
 
@@ -1187,14 +1188,16 @@ static struct rfkill *acer_rfkill_register(struct device *dev,
                 return ERR_PTR(-ENOMEM);
 
         status = get_device_status(&state, cap);
-        if (ACPI_SUCCESS(status))
-                rfkill_init_sw_state(rfkill_dev, !state);
 
         err = rfkill_register(rfkill_dev);
         if (err) {
                 rfkill_destroy(rfkill_dev);
                 return ERR_PTR(err);
         }
+
+        if (ACPI_SUCCESS(status))
+                rfkill_set_sw_state(rfkill_dev, !state);
+
         return rfkill_dev;
 }
 
@@ -1229,14 +1232,19 @@ static int acer_rfkill_init(struct device *dev)
                 }
         }
 
-        schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ));
+        rfkill_inited = true;
+
+        if (ec_raw_mode || !wmi_has_guid(ACERWMID_EVENT_GUID))
+                schedule_delayed_work(&acer_rfkill_work,
+                        round_jiffies_relative(HZ));
 
         return 0;
 }
 
 static void acer_rfkill_exit(void)
 {
-        cancel_delayed_work_sync(&acer_rfkill_work);
+        if (ec_raw_mode || !wmi_has_guid(ACERWMID_EVENT_GUID))
+                cancel_delayed_work_sync(&acer_rfkill_work);
 
         rfkill_unregister(wireless_rfkill);
         rfkill_destroy(wireless_rfkill);
@@ -1309,7 +1317,7 @@ static void acer_wmi_notify(u32 value, void *context)
 
         status = wmi_get_event_data(value, &response);
         if (status != AE_OK) {
-                printk(ACER_WARNING "bad event status 0x%x\n", status);
+                pr_warning("bad event status 0x%x\n", status);
                 return;
         }
 
@@ -1318,14 +1326,12 @@ static void acer_wmi_notify(u32 value, void *context)
         if (!obj)
                 return;
         if (obj->type != ACPI_TYPE_BUFFER) {
-                printk(ACER_WARNING "Unknown response received %d\n",
-                        obj->type);
+                pr_warning("Unknown response received %d\n", obj->type);
                 kfree(obj);
                 return;
         }
         if (obj->buffer.length != 8) {
-                printk(ACER_WARNING "Unknown buffer length %d\n",
-                        obj->buffer.length);
+                pr_warning("Unknown buffer length %d\n", obj->buffer.length);
                 kfree(obj);
                 return;
         }
@@ -1335,13 +1341,26 @@ static void acer_wmi_notify(u32 value, void *context)
 
         switch (return_value.function) {
         case WMID_HOTKEY_EVENT:
+                if (return_value.device_state) {
+                        u16 device_state = return_value.device_state;
+                        pr_debug("deivces states: 0x%x\n", device_state);
+                        if (has_cap(ACER_CAP_WIRELESS))
+                                rfkill_set_sw_state(wireless_rfkill,
+                                !(device_state & ACER_WMID3_GDS_WIRELESS));
+                        if (has_cap(ACER_CAP_BLUETOOTH))
+                                rfkill_set_sw_state(bluetooth_rfkill,
+                                !(device_state & ACER_WMID3_GDS_BLUETOOTH));
+                        if (has_cap(ACER_CAP_THREEG))
+                                rfkill_set_sw_state(threeg_rfkill,
+                                !(device_state & ACER_WMID3_GDS_THREEG));
+                }
                 if (!sparse_keymap_report_event(acer_wmi_input_dev,
                                 return_value.key_num, 1, true))
-                        printk(ACER_WARNING "Unknown key number - 0x%x\n",
+                        pr_warning("Unknown key number - 0x%x\n",
                                 return_value.key_num);
                 break;
         default:
-                printk(ACER_WARNING "Unknown function number - %d - %d\n",
+                pr_warning("Unknown function number - %d - %d\n",
                         return_value.function, return_value.key_num);
                 break;
         }
@@ -1370,8 +1389,7 @@ wmid3_set_lm_mode(struct lm_input_params *params,
                 return AE_ERROR;
         }
         if (obj->buffer.length != 4) {
-                printk(ACER_WARNING "Unknown buffer length %d\n",
-                       obj->buffer.length);
+                pr_warning("Unknown buffer length %d\n", obj->buffer.length);
                 kfree(obj);
                 return AE_ERROR;
         }
@@ -1396,11 +1414,11 @@ static int acer_wmi_enable_ec_raw(void)
         status = wmid3_set_lm_mode(&params, &return_value);
 
         if (return_value.error_code || return_value.ec_return_value)
-                printk(ACER_WARNING "Enabling EC raw mode failed: "
+                pr_warning("Enabling EC raw mode failed: "
                        "0x%x - 0x%x\n", return_value.error_code,
                        return_value.ec_return_value);
         else
-                printk(ACER_INFO "Enabled EC raw mode");
+                pr_info("Enabled EC raw mode");
 
         return status;
 }
@@ -1419,7 +1437,7 @@ static int acer_wmi_enable_lm(void)
         status = wmid3_set_lm_mode(&params, &return_value);
 
         if (return_value.error_code || return_value.ec_return_value)
-                printk(ACER_WARNING "Enabling Launch Manager failed: "
+                pr_warning("Enabling Launch Manager failed: "
                        "0x%x - 0x%x\n", return_value.error_code,
                        return_value.ec_return_value);
 
@@ -1553,6 +1571,7 @@ pm_message_t state)
 
         if (has_cap(ACER_CAP_MAILLED)) {
                 get_u32(&value, ACER_CAP_MAILLED);
+                set_u32(LED_OFF, ACER_CAP_MAILLED);
                 data->mailled = value;
         }
 
@@ -1580,6 +1599,17 @@ static int acer_platform_resume(struct platform_device *device)
         return 0;
 }
 
+static void acer_platform_shutdown(struct platform_device *device)
+{
+        struct acer_data *data = &interface->data;
+
+        if (!data)
+                return;
+
+        if (has_cap(ACER_CAP_MAILLED))
+                set_u32(LED_OFF, ACER_CAP_MAILLED);
+}
+
 static struct platform_driver acer_platform_driver = {
         .driver = {
                 .name = "acer-wmi",
@@ -1589,6 +1619,7 @@ static struct platform_driver acer_platform_driver = {
         .remove = acer_platform_remove,
         .suspend = acer_platform_suspend,
         .resume = acer_platform_resume,
+        .shutdown = acer_platform_shutdown,
 };
 
 static struct platform_device *acer_platform_device;
@@ -1636,7 +1667,7 @@ static int create_debugfs(void)
 {
         interface->debug.root = debugfs_create_dir("acer-wmi", NULL);
         if (!interface->debug.root) {
-                printk(ACER_ERR "Failed to create debugfs directory");
+                pr_err("Failed to create debugfs directory");
                 return -ENOMEM;
         }
 
@@ -1657,11 +1688,10 @@ static int __init acer_wmi_init(void)
 {
         int err;
 
-        printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
+        pr_info("Acer Laptop ACPI-WMI Extras\n");
 
         if (dmi_check_system(acer_blacklist)) {
-                printk(ACER_INFO "Blacklisted hardware detected - "
-                                "not loading\n");
+                pr_info("Blacklisted hardware detected - not loading\n");
                 return -ENODEV;
         }
 
@@ -1678,12 +1708,11 @@ static int __init acer_wmi_init(void)
 
         if (wmi_has_guid(WMID_GUID2) && interface) {
                 if (ACPI_FAILURE(WMID_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available WMID "
-                                        "devices\n");
+                        pr_err("Unable to detect available WMID devices\n");
                         return -ENODEV;
                 }
         } else if (!wmi_has_guid(WMID_GUID2) && interface) {
-                printk(ACER_ERR "No WMID device detection method found\n");
+                pr_err("No WMID device detection method found\n");
                 return -ENODEV;
         }
 
@@ -1691,8 +1720,7 @@ static int __init acer_wmi_init(void)
                 interface = &AMW0_interface;
 
                 if (ACPI_FAILURE(AMW0_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available AMW0 "
-                                        "devices\n");
+                        pr_err("Unable to detect available AMW0 devices\n");
                         return -ENODEV;
                 }
         }
@@ -1701,8 +1729,7 @@ static int __init acer_wmi_init(void)
                 AMW0_find_mailled();
 
         if (!interface) {
-                printk(ACER_INFO "No or unsupported WMI interface, unable to "
-                                "load\n");
+                pr_err("No or unsupported WMI interface, unable to load\n");
                 return -ENODEV;
         }
 
@@ -1710,22 +1737,22 @@ static int __init acer_wmi_init(void)
 
         if (acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
                 interface->capability &= ~ACER_CAP_BRIGHTNESS;
-                printk(ACER_INFO "Brightness must be controlled by "
+                pr_info("Brightness must be controlled by "
                        "generic video driver\n");
         }
 
         if (wmi_has_guid(WMID_GUID3)) {
                 if (ec_raw_mode) {
                         if (ACPI_FAILURE(acer_wmi_enable_ec_raw())) {
-                                printk(ACER_ERR "Cannot enable EC raw mode\n");
+                                pr_err("Cannot enable EC raw mode\n");
                                 return -ENODEV;
                         }
                 } else if (ACPI_FAILURE(acer_wmi_enable_lm())) {
-                        printk(ACER_ERR "Cannot enable Launch Manager mode\n");
+                        pr_err("Cannot enable Launch Manager mode\n");
                         return -ENODEV;
                 }
         } else if (ec_raw_mode) {
-                printk(ACER_INFO "No WMID EC raw mode enable method\n");
+                pr_info("No WMID EC raw mode enable method\n");
         }
 
         if (wmi_has_guid(ACERWMID_EVENT_GUID)) {
@@ -1736,7 +1763,7 @@ static int __init acer_wmi_init(void)
 
         err = platform_driver_register(&acer_platform_driver);
         if (err) {
-                printk(ACER_ERR "Unable to register platform driver.\n");
+                pr_err("Unable to register platform driver.\n");
                 goto error_platform_register;
         }
 
@@ -1791,7 +1818,7 @@ static void __exit acer_wmi_exit(void)
         platform_device_unregister(acer_platform_device);
         platform_driver_unregister(&acer_platform_driver);
 
-        printk(ACER_INFO "Acer Laptop WMI Extras unloaded\n");
+        pr_info("Acer Laptop WMI Extras unloaded\n");
         return;
 }