Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[linux-2.6-microblaze.git] / drivers / hid / hid-wiimote-modules.c

diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c
index 05e23c4..4390eee 100644 (file)
--- a/drivers/hid/hid-wiimote-modules.c
+++ b/drivers/hid/hid-wiimote-modules.c
@@ -296,14 +296,12 @@ static const struct wiimod_ops wiimod_battery = {
 
 static enum led_brightness wiimod_led_get(struct led_classdev *led_dev)
 {
-       struct wiimote_data *wdata;
        struct device *dev = led_dev->dev->parent;
+       struct wiimote_data *wdata = dev_to_wii(dev);
        int i;
        unsigned long flags;
        bool value = false;
 
-       wdata = hid_get_drvdata(container_of(dev, struct hid_device, dev));
-
        for (i = 0; i < 4; ++i) {
                if (wdata->leds[i] == led_dev) {
                        spin_lock_irqsave(&wdata->state.lock, flags);
@@ -319,14 +317,12 @@ static enum led_brightness wiimod_led_get(struct led_classdev *led_dev)
 static void wiimod_led_set(struct led_classdev *led_dev,
                           enum led_brightness value)
 {
-       struct wiimote_data *wdata;
        struct device *dev = led_dev->dev->parent;
+       struct wiimote_data *wdata = dev_to_wii(dev);
        int i;
        unsigned long flags;
        __u8 state, flag;
 
-       wdata = hid_get_drvdata(container_of(dev, struct hid_device, dev));
-
        for (i = 0; i < 4; ++i) {
                if (wdata->leds[i] == led_dev) {
                        flag = WIIPROTO_FLAG_LED(i + 1);