lkml.org 
[lkml]   [2011]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/16] asus-wmi: add gps rfkill support
    Date
    Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
    ---
    drivers/platform/x86/asus-wmi.c | 16 ++++++++++++++++
    1 files changed, 16 insertions(+), 0 deletions(-)

    diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
    index db4413a..83d4d26 100644
    --- a/drivers/platform/x86/asus-wmi.c
    +++ b/drivers/platform/x86/asus-wmi.c
    @@ -194,6 +194,7 @@ struct asus_wmi {
    struct asus_rfkill bluetooth;
    struct asus_rfkill wimax;
    struct asus_rfkill wwan3g;
    + struct asus_rfkill gps;

    struct hotplug_slot *hotplug_slot;
    struct mutex hotplug_lock;
    @@ -835,6 +836,11 @@ static void asus_wmi_rfkill_exit(struct asus_wmi *asus)
    rfkill_destroy(asus->wwan3g.rfkill);
    asus->wwan3g.rfkill = NULL;
    }
    + if (asus->gps.rfkill) {
    + rfkill_unregister(asus->gps.rfkill);
    + rfkill_destroy(asus->gps.rfkill);
    + asus->gps.rfkill = NULL;
    + }
    }

    static int asus_wmi_rfkill_init(struct asus_wmi *asus)
    @@ -869,6 +875,12 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus)
    if (result && result != -ENODEV)
    goto exit;

    + result = asus_new_rfkill(asus, &asus->gps, "asus-gps",
    + RFKILL_TYPE_GPS, ASUS_WMI_DEVID_GPS);
    +
    + if (result && result != -ENODEV)
    + goto exit;
    +
    if (!asus->driver->hotplug_wireless)
    goto exit;

    @@ -1721,6 +1733,10 @@ static int asus_hotk_restore(struct device *device)
    bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_WWAN3G);
    rfkill_set_sw_state(asus->wwan3g.rfkill, bl);
    }
    + if (asus->gps.rfkill) {
    + bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPS);
    + rfkill_set_sw_state(asus->gps.rfkill, bl);
    + }

    return 0;
    }
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-07-01 11:39    [W:0.020 / U:0.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site