iwinfo: make 'type' visible in wrapped iwinfo

[openwrt.git] / package / kernel / gpio-button-hotplug / src / gpio-button-hotplug.c

diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 74c2eca..ea6f94b 100644 (file)
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -128,6 +128,7 @@ static int bh_event_add_var(struct bh_event *event, int argv,
 
 static int button_hotplug_fill_event(struct bh_event *event)
 {
+       char *s;
        int ret;
 
        ret = bh_event_add_var(event, 0, "HOME=%s", "/");
@@ -139,14 +140,11 @@ static int button_hotplug_fill_event(struct bh_event *event)
        if (ret)
                return ret;
 
-       char *s;
        switch (event->type) {
-               case EV_KEY:
-                       s = "button";
-                       break;
                case EV_SW:
                        s = "switch";
                        break;
+               case EV_KEY:
                default:
                        s = "button";
                        break;
@@ -274,23 +272,24 @@ struct gpio_keys_polled_dev {
        struct gpio_keys_button_data data[0];
 };
 
-static inline int gpio_button_get_value(struct gpio_keys_button *button,
-                         struct gpio_keys_button_data *bdata)
+static int gpio_button_get_value(struct gpio_keys_button *button,
+                                struct gpio_keys_button_data *bdata)
 {
+       int val;
+
        if (bdata->can_sleep)
-               return !!gpio_get_value_cansleep(button->gpio);
+               val = !!gpio_get_value_cansleep(button->gpio);
        else
-               return !!gpio_get_value(button->gpio);
+               val = !!gpio_get_value(button->gpio);
+
+       return val ^ button->active_low;
 }
 
 static void gpio_keys_polled_check_state(struct gpio_keys_button *button,
                                         struct gpio_keys_button_data *bdata)
 {
-       int state;
+       int state = gpio_button_get_value(button, bdata);
 
-       state = gpio_button_get_value(button, bdata);
-
-       state = !!(state ^ button->active_low);
        if (state != bdata->last_state) {
                unsigned int type = button->type ?: EV_KEY;
 
@@ -299,7 +298,9 @@ static void gpio_keys_polled_check_state(struct gpio_keys_button *button,
                        return;
                }
 
-               button_hotplug_event(bdata, type, button->code, state);
+               if (bdata->last_state != -1)
+                       button_hotplug_event(bdata, type, button->code, state);
+
                bdata->last_state = state;
        }
 
@@ -509,7 +510,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                }
 
                bdata->can_sleep = gpio_cansleep(gpio);
-               bdata->last_state = gpio_button_get_value(button, bdata);
+               bdata->last_state = -1;
                bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
                                                pdata->poll_interval);
        }