netdev: ARRAY_SIZE() cleanups

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rt2x00 / rt2x00rfkill.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index dc5b696f4751e50d53bc311bfcea79f7b1dbe2b2..16d365deefd13ef6bcf124fcb3cf0e695b408293 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -45,20 +45,18 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state)
                return 0;
 
        /*
-        * Only continue if we have an active interface,
-        * either monitor or non-monitor should be present.
+        * Only continue if there are enabled interfaces.
         */
-       if (!is_interface_present(&rt2x00dev->interface) &&
-           !is_monitor_present(&rt2x00dev->interface))
+       if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
                return 0;
 
        if (state == RFKILL_STATE_ON) {
                INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
-               __set_bit(DEVICE_ENABLED_RADIO_HW, &rt2x00dev->flags);
+               __clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
                retval = rt2x00lib_enable_radio(rt2x00dev);
        } else if (state == RFKILL_STATE_OFF) {
                INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
-               __clear_bit(DEVICE_ENABLED_RADIO_HW, &rt2x00dev->flags);
+               __set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
                rt2x00lib_disable_radio(rt2x00dev);
        }
 
@@ -70,15 +68,17 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
        struct rt2x00_dev *rt2x00dev = poll_dev->private;
        int state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
 
-       if (rt2x00dev->rfkill->state != state)
+       if (rt2x00dev->rfkill->state != state) {
                input_report_key(poll_dev->input, KEY_WLAN, 1);
+               input_report_key(poll_dev->input, KEY_WLAN, 0);
+       }
 }
 
 int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
 {
        int retval;
 
-       if (!test_bit(DEVICE_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+       if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
                return 0;
 
        retval = rfkill_register(rt2x00dev->rfkill);
@@ -94,12 +94,19 @@ int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
                return retval;
        }
 
+       /*
+        * Force initial poll which will detect the initial device state,
+        * and correctly sends the signal to the rfkill layer about this
+        * state.
+        */
+       rt2x00rfkill_poll(rt2x00dev->poll_dev);
+
        return 0;
 }
 
 void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
 {
-       if (!test_bit(DEVICE_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+       if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
                return;
 
        input_unregister_polled_device(rt2x00dev->poll_dev);
@@ -110,39 +117,64 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
 {
        struct device *device = wiphy_dev(rt2x00dev->hw->wiphy);
 
-       if (!test_bit(DEVICE_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+       if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
                return 0;
 
        rt2x00dev->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
        if (!rt2x00dev->rfkill) {
                ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");
-               return -ENOMEM;
+               goto exit;
        }
 
        rt2x00dev->rfkill->name = rt2x00dev->ops->name;
        rt2x00dev->rfkill->data = rt2x00dev;
-       rt2x00dev->rfkill->state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
+       rt2x00dev->rfkill->state = -1;
        rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
 
        rt2x00dev->poll_dev = input_allocate_polled_device();
        if (!rt2x00dev->poll_dev) {
                ERROR(rt2x00dev, "Failed to allocate polled device.\n");
-               rfkill_free(rt2x00dev->rfkill);
-               return -ENOMEM;
+               goto exit_free_rfkill;
        }
 
        rt2x00dev->poll_dev->private = rt2x00dev;
        rt2x00dev->poll_dev->poll = rt2x00rfkill_poll;
        rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
 
+       rt2x00dev->poll_dev->input = input_allocate_device();
+       if (!rt2x00dev->poll_dev->input) {
+               ERROR(rt2x00dev, "Failed to allocate input device.\n");
+               goto exit_free_polldev;
+       }
+
+       rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name;
+       rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
+       rt2x00dev->poll_dev->input->id.bustype = BUS_HOST;
+       rt2x00dev->poll_dev->input->id.vendor = 0x1814;
+       rt2x00dev->poll_dev->input->id.product = rt2x00dev->chip.rt;
+       rt2x00dev->poll_dev->input->id.version = rt2x00dev->chip.rev;
+       rt2x00dev->poll_dev->input->dev.parent = device;
+       rt2x00dev->poll_dev->input->evbit[0] = BIT(EV_KEY);
+       set_bit(KEY_WLAN, rt2x00dev->poll_dev->input->keybit);
+
        return 0;
+
+exit_free_polldev:
+       input_free_polled_device(rt2x00dev->poll_dev);
+
+exit_free_rfkill:
+       rfkill_free(rt2x00dev->rfkill);
+
+exit:
+       return -ENOMEM;
 }
 
 void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
 {
-       if (!test_bit(DEVICE_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+       if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
                return;
 
+       input_free_device(rt2x00dev->poll_dev->input);
        input_free_polled_device(rt2x00dev->poll_dev);
        rfkill_free(rt2x00dev->rfkill);
 }