asus-wmi: add uwb rfkill support
authorCorentin Chary <corentin.chary@gmail.com>
Fri, 1 Jul 2011 09:34:41 +0000 (11:34 +0200)
committerMatthew Garrett <mjg@redhat.com>
Fri, 5 Aug 2011 18:46:07 +0000 (14:46 -0400)
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/asus-wmi.c

index 57514deb8e2be5bcf92831e4f4c7414061d71ee8..95cba9ebf6c08ddab129840447367fb0e83aea9e 100644 (file)
@@ -195,6 +195,7 @@ struct asus_wmi {
        struct asus_rfkill wimax;
        struct asus_rfkill wwan3g;
        struct asus_rfkill gps;
+       struct asus_rfkill uwb;
 
        struct hotplug_slot *hotplug_slot;
        struct mutex hotplug_lock;
@@ -841,6 +842,11 @@ static void asus_wmi_rfkill_exit(struct asus_wmi *asus)
                rfkill_destroy(asus->gps.rfkill);
                asus->gps.rfkill = NULL;
        }
+       if (asus->uwb.rfkill) {
+               rfkill_unregister(asus->uwb.rfkill);
+               rfkill_destroy(asus->uwb.rfkill);
+               asus->uwb.rfkill = NULL;
+       }
 }
 
 static int asus_wmi_rfkill_init(struct asus_wmi *asus)
@@ -881,6 +887,12 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus)
        if (result && result != -ENODEV)
                goto exit;
 
+       result = asus_new_rfkill(asus, &asus->uwb, "asus-uwb",
+                                RFKILL_TYPE_UWB, ASUS_WMI_DEVID_UWB);
+
+       if (result && result != -ENODEV)
+               goto exit;
+
        if (!asus->driver->hotplug_wireless)
                goto exit;
 
@@ -1737,6 +1749,10 @@ static int asus_hotk_restore(struct device *device)
                bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPS);
                rfkill_set_sw_state(asus->gps.rfkill, bl);
        }
+       if (asus->uwb.rfkill) {
+               bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_UWB);
+               rfkill_set_sw_state(asus->uwb.rfkill, bl);
+       }
 
        return 0;
 }