kernel: gpio-button-hotplug: Add missing ONESHOT flag to threaded IRQ request

[openwrt/svn-archive/archive.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 412c045fe4e838fb858a503a596788f5bd9b09a8..0ebe6c55767e642a77d0e5e78d7e36741d1b8476 100644 (file)
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -23,11 +23,12 @@
 #include <linux/netlink.h>
 #include <linux/kobject.h>
 #include <linux/input.h>
 #include <linux/netlink.h>
 #include <linux/kobject.h>
 #include <linux/input.h>

+#include <linux/interrupt.h>

 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
 #include <linux/gpio_keys.h>
 
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
 #include <linux/gpio_keys.h>
 

-#define DRV_NAME       "gpio-keys-polled"
+#define DRV_NAME       "gpio-keys"

 
 #define BH_SKB_SIZE    2048
 
 
 #define BH_SKB_SIZE    2048
 


@@ -49,6 +50,7 @@ struct bh_priv {
 
 struct bh_event {
        const char              *name;
 
 struct bh_event {
        const char              *name;

+       unsigned int            type;

        char                    *action;
        unsigned long           seen;
 
        char                    *action;
        unsigned long           seen;
 


@@ -68,6 +70,7 @@ struct gpio_keys_button_data {
        int count;
        int threshold;
        int can_sleep;
        int count;
        int threshold;
        int can_sleep;

+       struct gpio_keys_button *b;

 };
 
 extern u64 uevent_next_seqnum(void);
 };
 
 extern u64 uevent_next_seqnum(void);


@@ -89,17 +92,17 @@ static struct bh_map button_map[] = {
        BH_MAP(BTN_7,           "BTN_7"),
        BH_MAP(BTN_8,           "BTN_8"),
        BH_MAP(BTN_9,           "BTN_9"),
        BH_MAP(BTN_7,           "BTN_7"),
        BH_MAP(BTN_8,           "BTN_8"),
        BH_MAP(BTN_9,           "BTN_9"),

+       BH_MAP(KEY_POWER,       "power"),

        BH_MAP(KEY_RESTART,     "reset"),
        BH_MAP(KEY_RFKILL,      "rfkill"),
        BH_MAP(KEY_RESTART,     "reset"),
        BH_MAP(KEY_RFKILL,      "rfkill"),

-#ifdef KEY_WPS_BUTTON

        BH_MAP(KEY_WPS_BUTTON,  "wps"),
        BH_MAP(KEY_WPS_BUTTON,  "wps"),

-#endif /* KEY_WPS_BUTTON */
+       BH_MAP(KEY_WIMAX,       "wwan"),

 };
 
 /* -------------------------------------------------------------------------*/
 
 };
 
 /* -------------------------------------------------------------------------*/
 

-static int bh_event_add_var(struct bh_event *event, int argv,
-               const char *format, ...)
+static __printf(3, 4)
+int bh_event_add_var(struct bh_event *event, int argv, const char *format, ...)

 {
        static char buf[128];
        char *s;
 {
        static char buf[128];
        char *s;


@@ -114,8 +117,7 @@ static int bh_event_add_var(struct bh_event *event, int argv,
        va_end(args);
 
        if (len >= sizeof(buf)) {
        va_end(args);
 
        if (len >= sizeof(buf)) {

-               BH_ERR("buffer size too small\n");
-               WARN_ON(1);
+               WARN(1, "buffer size too small");

                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 


@@ -152,6 +154,12 @@ static int button_hotplug_fill_event(struct bh_event *event)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

+       if (event->type == EV_SW) {
+               ret = bh_event_add_var(event, 0, "TYPE=%s", "switch");
+               if (ret)
+                       return ret;
+       }
+

        ret = bh_event_add_var(event, 0, "SEEN=%ld", event->seen);
        if (ret)
                return ret;
        ret = bh_event_add_var(event, 0, "SEEN=%ld", event->seen);
        if (ret)
                return ret;


@@ -190,8 +198,8 @@ static void button_hotplug_work(struct work_struct *work)
        kfree(event);
 }
 
        kfree(event);
 }
 

-static int button_hotplug_create_event(const char *name, unsigned long seen,
-               int pressed)
+static int button_hotplug_create_event(const char *name, unsigned int type,
+               unsigned long seen, int pressed)

 {
        struct bh_event *event;
 
 {
        struct bh_event *event;
 


@@ -203,6 +211,7 @@ static int button_hotplug_create_event(const char *name, unsigned long seen,
                return -ENOMEM;
 
        event->name = name;
                return -ENOMEM;
 
        event->name = name;

+       event->type = type;

        event->seen = seen;
        event->action = pressed ? "pressed" : "released";
 
        event->seen = seen;
        event->action = pressed ? "pressed" : "released";
 


@@ -214,7 +223,6 @@ static int button_hotplug_create_event(const char *name, unsigned long seen,
 
 /* -------------------------------------------------------------------------*/
 
 
 /* -------------------------------------------------------------------------*/
 

-#ifdef CONFIG_HOTPLUG

 static int button_get_index(unsigned int code)
 {
        int i;
 static int button_get_index(unsigned int code)
 {
        int i;


@@ -225,34 +233,30 @@ static int button_get_index(unsigned int code)
 
        return -1;
 }
 
        return -1;
 }

+

 static void button_hotplug_event(struct gpio_keys_button_data *data,
 static void button_hotplug_event(struct gpio_keys_button_data *data,

-                          unsigned int type, unsigned int code, int value)
+                          unsigned int type, int value)

 {
        struct bh_priv *priv = &data->bh;
        unsigned long seen = jiffies;
        int btn;
 
 {
        struct bh_priv *priv = &data->bh;
        unsigned long seen = jiffies;
        int btn;
 

-       BH_DBG("event type=%u, code=%u, value=%d\n", type, code, value);
+       BH_DBG("event type=%u, code=%u, value=%d\n", type, data->b->code, value);

 
 

-       if (type != EV_KEY)
+       if ((type != EV_KEY) && (type != EV_SW))

                return;
 
                return;
 

-       btn = button_get_index(code);
+       btn = button_get_index(data->b->code);

        if (btn < 0)
                return;
 
        if (btn < 0)
                return;
 

-       button_hotplug_create_event(button_map[btn].name,
+       button_hotplug_create_event(button_map[btn].name, type,

                        (seen - priv->seen) / HZ, value);
        priv->seen = seen;
 }
                        (seen - priv->seen) / HZ, value);
        priv->seen = seen;
 }

-#else
-static void button_hotplug_event(struct gpio_keys_button_data *data,
-                          unsigned int type, unsigned int code, int value)
-{
-}
-#endif /* CONFIG_HOTPLUG */

 
 

-struct gpio_keys_polled_dev {
+struct gpio_keys_button_dev {
+       int polled;

        struct delayed_work work;
 
        struct device *dev;
        struct delayed_work work;
 
        struct device *dev;


@@ -260,81 +264,91 @@ struct gpio_keys_polled_dev {
        struct gpio_keys_button_data data[0];
 };
 
        struct gpio_keys_button_data data[0];
 };
 

-static void gpio_keys_polled_check_state(struct gpio_keys_button *button,
-                                        struct gpio_keys_button_data *bdata)
+static int gpio_button_get_value(struct gpio_keys_button_data *bdata)

 {
 {

-       int state;
+       int val;

 
        if (bdata->can_sleep)
 
        if (bdata->can_sleep)

-               state = !!gpio_get_value_cansleep(button->gpio);
+               val = !!gpio_get_value_cansleep(bdata->b->gpio);

        else
        else

-               state = !!gpio_get_value(button->gpio);
+               val = !!gpio_get_value(bdata->b->gpio);
+
+       return val ^ bdata->b->active_low;
+}
+
+static void gpio_keys_polled_check_state(struct gpio_keys_button_data *bdata)
+{
+       int state = gpio_button_get_value(bdata);

 
 

-       state = !!(state ^ button->active_low);

        if (state != bdata->last_state) {
        if (state != bdata->last_state) {

-               unsigned int type = button->type ?: EV_KEY;
+               unsigned int type = bdata->b->type ?: EV_KEY;

 
                if (bdata->count < bdata->threshold) {
                        bdata->count++;
                        return;
                }
 
 
                if (bdata->count < bdata->threshold) {
                        bdata->count++;
                        return;
                }
 

-               button_hotplug_event(bdata, type, button->code, state);
+               if ((bdata->last_state != -1) || (type == EV_SW))
+                       button_hotplug_event(bdata, type, state);
+

                bdata->last_state = state;
        }
 
        bdata->count = 0;
 }
 
                bdata->last_state = state;
        }
 
        bdata->count = 0;
 }
 

-static void gpio_keys_polled_queue_work(struct gpio_keys_polled_dev *bdev)
+static void gpio_keys_polled_queue_work(struct gpio_keys_button_dev *bdev)

 {
        struct gpio_keys_platform_data *pdata = bdev->pdata;
        unsigned long delay = msecs_to_jiffies(pdata->poll_interval);
 
        if (delay >= HZ)
 {
        struct gpio_keys_platform_data *pdata = bdev->pdata;
        unsigned long delay = msecs_to_jiffies(pdata->poll_interval);
 
        if (delay >= HZ)

-           delay = round_jiffies_relative(delay);
+               delay = round_jiffies_relative(delay);

        schedule_delayed_work(&bdev->work, delay);
 }
 
 static void gpio_keys_polled_poll(struct work_struct *work)
 {
        schedule_delayed_work(&bdev->work, delay);
 }
 
 static void gpio_keys_polled_poll(struct work_struct *work)
 {

-       struct gpio_keys_polled_dev *bdev =
-               container_of(work, struct gpio_keys_polled_dev, work.work);
-       struct gpio_keys_platform_data *pdata = bdev->pdata;
+       struct gpio_keys_button_dev *bdev =
+               container_of(work, struct gpio_keys_button_dev, work.work);

        int i;
 
        for (i = 0; i < bdev->pdata->nbuttons; i++) {
                struct gpio_keys_button_data *bdata = &bdev->data[i];
        int i;
 
        for (i = 0; i < bdev->pdata->nbuttons; i++) {
                struct gpio_keys_button_data *bdata = &bdev->data[i];

-               gpio_keys_polled_check_state(&pdata->buttons[i], bdata);
+               gpio_keys_polled_check_state(bdata);

        }
        gpio_keys_polled_queue_work(bdev);
 }
 
        }
        gpio_keys_polled_queue_work(bdev);
 }
 

-static void gpio_keys_polled_open(struct gpio_keys_polled_dev *bdev)
+static void gpio_keys_polled_close(struct gpio_keys_button_dev *bdev)

 {
        struct gpio_keys_platform_data *pdata = bdev->pdata;
 {
        struct gpio_keys_platform_data *pdata = bdev->pdata;

-       int i;

 
 

-       if (pdata->enable)
-               pdata->enable(bdev->dev);
+       cancel_delayed_work_sync(&bdev->work);

 
 

-       /* report initial state of the buttons */
-       for (i = 0; i < pdata->nbuttons; i++)
-               gpio_keys_polled_check_state(&pdata->buttons[i], &bdev->data[i]);
+       if (pdata->disable)
+               pdata->disable(bdev->dev);
+}

 
 

-       gpio_keys_polled_queue_work(bdev);
+static irqreturn_t button_handle_irq(int irq, void *_bdata)
+{
+       struct gpio_keys_button_data *bdata = (struct gpio_keys_button_data *) _bdata;
+
+       button_hotplug_event(bdata, bdata->b->type ?: EV_KEY, gpio_button_get_value(bdata));
+
+       return IRQ_HANDLED;

 }
 
 #ifdef CONFIG_OF
 static struct gpio_keys_platform_data *
 }
 
 #ifdef CONFIG_OF
 static struct gpio_keys_platform_data *

-gpio_keys_polled_get_devtree_pdata(struct device *dev)
+gpio_keys_get_devtree_pdata(struct device *dev)

 {
        struct device_node *node, *pp;
        struct gpio_keys_platform_data *pdata;
        struct gpio_keys_button *button;
        int error;
        int nbuttons;
 {
        struct device_node *node, *pp;
        struct gpio_keys_platform_data *pdata;
        struct gpio_keys_button *button;
        int error;
        int nbuttons;

-       int i;
+       int i = 0;

 
        node = dev->of_node;
        if (!node)
 
        node = dev->of_node;
        if (!node)


@@ -344,7 +358,7 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
        if (nbuttons == 0)
                return NULL;
 
        if (nbuttons == 0)
                return NULL;
 

-       pdata = kzalloc(sizeof(*pdata) + nbuttons * (sizeof *button),
+       pdata = devm_kzalloc(dev, sizeof(*pdata) + nbuttons * (sizeof *button),

                GFP_KERNEL);
        if (!pdata) {
                error = -ENOMEM;
                GFP_KERNEL);
        if (!pdata) {
                error = -ENOMEM;


@@ -357,7 +371,6 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
        pdata->rep = !!of_get_property(node, "autorepeat", NULL);
        of_property_read_u32(node, "poll-interval", &pdata->poll_interval);
 
        pdata->rep = !!of_get_property(node, "autorepeat", NULL);
        of_property_read_u32(node, "poll-interval", &pdata->poll_interval);
 

-       i = 0;

        for_each_child_of_node(node, pp) {
                enum of_gpio_flags flags;
 
        for_each_child_of_node(node, pp) {
                enum of_gpio_flags flags;
 


@@ -370,13 +383,24 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
                button = &pdata->buttons[i++];
 
                button->gpio = of_get_gpio_flags(pp, 0, &flags);
                button = &pdata->buttons[i++];
 
                button->gpio = of_get_gpio_flags(pp, 0, &flags);

-               button->active_low = flags & OF_GPIO_ACTIVE_LOW;
+               if (button->gpio < 0) {
+                       error = button->gpio;
+                       if (error != -ENOENT) {
+                               if (error != -EPROBE_DEFER)
+                                       dev_err(dev,
+                                               "Failed to get gpio flags, error: %d\n",
+                                               error);
+                               return ERR_PTR(error);
+                       }
+               } else {
+                       button->active_low = flags & OF_GPIO_ACTIVE_LOW;
+               }

 
                if (of_property_read_u32(pp, "linux,code", &button->code)) {
                        dev_err(dev, "Button without keycode: 0x%x\n",
                                button->gpio);
                        error = -EINVAL;
 
                if (of_property_read_u32(pp, "linux,code", &button->code)) {
                        dev_err(dev, "Button without keycode: 0x%x\n",
                                button->gpio);
                        error = -EINVAL;

-                       goto err_free_pdata;
+                       goto err_out;

                }
 
                button->desc = of_get_property(pp, "label", NULL);
                }
 
                button->desc = of_get_property(pp, "label", NULL);


@@ -393,17 +417,21 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
 
        if (pdata->nbuttons == 0) {
                error = -EINVAL;
 
        if (pdata->nbuttons == 0) {
                error = -EINVAL;

-               goto err_free_pdata;
+               goto err_out;

        }
 
        return pdata;
 
        }
 
        return pdata;
 

-err_free_pdata:
-       kfree(pdata);

 err_out:
        return ERR_PTR(error);
 }
 
 err_out:
        return ERR_PTR(error);
 }
 

+static struct of_device_id gpio_keys_of_match[] = {
+       { .compatible = "gpio-keys", },
+       { },
+};
+MODULE_DEVICE_TABLE(of, gpio_keys_of_match);
+

 static struct of_device_id gpio_keys_polled_of_match[] = {
        { .compatible = "gpio-keys-polled", },
        { },
 static struct of_device_id gpio_keys_polled_of_match[] = {
        { .compatible = "gpio-keys-polled", },
        { },


@@ -413,47 +441,47 @@ MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match);
 #else
 
 static inline struct gpio_keys_platform_data *
 #else
 
 static inline struct gpio_keys_platform_data *

-gpio_keys_polled_get_devtree_pdata(struct device *dev)
+gpio_keys_get_devtree_pdata(struct device *dev)

 {
        return NULL;
 }
 #endif
 
 {
        return NULL;
 }
 #endif
 

-static void gpio_keys_polled_close(struct gpio_keys_polled_dev *bdev)
-{
-       struct gpio_keys_platform_data *pdata = bdev->pdata;
-
-       cancel_delayed_work_sync(&bdev->work);
-
-       if (pdata->disable)
-               pdata->disable(bdev->dev);
-}
-
-static int gpio_keys_polled_probe(struct platform_device *pdev)
+static int gpio_keys_button_probe(struct platform_device *pdev,
+               struct gpio_keys_button_dev **_bdev, int polled)

 {
        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
        struct device *dev = &pdev->dev;
 {
        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
        struct device *dev = &pdev->dev;

-       struct gpio_keys_polled_dev *bdev;
+       struct gpio_keys_button_dev *bdev;
+       struct gpio_keys_button *buttons;

        int error;
        int i;
 
        if (!pdata) {
        int error;
        int i;
 
        if (!pdata) {

-               pdata = gpio_keys_polled_get_devtree_pdata(dev);
+               pdata = gpio_keys_get_devtree_pdata(dev);

                if (IS_ERR(pdata))
                        return PTR_ERR(pdata);
                if (!pdata) {
                        dev_err(dev, "missing platform data\n");
                        return -EINVAL;
                }
                if (IS_ERR(pdata))
                        return PTR_ERR(pdata);
                if (!pdata) {
                        dev_err(dev, "missing platform data\n");
                        return -EINVAL;
                }

+               pdev->dev.platform_data = pdata;

        }
 
        }
 

-       if (!pdata->poll_interval) {
+       if (polled && !pdata->poll_interval) {

                dev_err(dev, "missing poll_interval value\n");
                dev_err(dev, "missing poll_interval value\n");

-               error = -EINVAL;
-               goto err_free_pdata;
+               return -EINVAL;

        }
 
        }
 

-       bdev = kzalloc(sizeof(struct gpio_keys_polled_dev) +
+       buttons = devm_kzalloc(dev, pdata->nbuttons * sizeof(struct gpio_keys_button),
+                      GFP_KERNEL);
+       if (!buttons) {
+               dev_err(dev, "no memory for button data\n");
+               return -ENOMEM;
+       }
+       memcpy(buttons, pdata->buttons, pdata->nbuttons * sizeof(struct gpio_keys_button));
+
+       bdev = devm_kzalloc(dev, sizeof(struct gpio_keys_button_dev) +

                       pdata->nbuttons * sizeof(struct gpio_keys_button_data),
                       GFP_KERNEL);
        if (!bdev) {
                       pdata->nbuttons * sizeof(struct gpio_keys_button_data),
                       GFP_KERNEL);
        if (!bdev) {


@@ -461,23 +489,24 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 

+       bdev->polled = polled;
+

        for (i = 0; i < pdata->nbuttons; i++) {
        for (i = 0; i < pdata->nbuttons; i++) {

-               struct gpio_keys_button *button = &pdata->buttons[i];
+               struct gpio_keys_button *button = &buttons[i];

                struct gpio_keys_button_data *bdata = &bdev->data[i];
                unsigned int gpio = button->gpio;
 
                if (button->wakeup) {
                struct gpio_keys_button_data *bdata = &bdev->data[i];
                unsigned int gpio = button->gpio;
 
                if (button->wakeup) {

-                       dev_err(dev, DRV_NAME " does not support wakeup\n");
-                       error = -EINVAL;
-                       goto err_free_gpio;
+                       dev_err(dev, DRV_NAME "does not support wakeup\n");
+                       return -EINVAL;

                }
 
                }
 

-               error = gpio_request(gpio,
+               error = devm_gpio_request(dev, gpio,

                                     button->desc ? button->desc : DRV_NAME);
                if (error) {
                        dev_err(dev, "unable to claim gpio %u, err=%d\n",
                                gpio, error);
                                     button->desc ? button->desc : DRV_NAME);
                if (error) {
                        dev_err(dev, "unable to claim gpio %u, err=%d\n",
                                gpio, error);

-                       goto err_free_gpio;
+                       return error;

                }
 
                error = gpio_direction_input(gpio);
                }
 
                error = gpio_direction_input(gpio);


@@ -485,79 +514,151 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                        dev_err(dev,
                                "unable to set direction on gpio %u, err=%d\n",
                                gpio, error);
                        dev_err(dev,
                                "unable to set direction on gpio %u, err=%d\n",
                                gpio, error);

-                       goto err_free_gpio;
+                       return error;

                }
 
                bdata->can_sleep = gpio_cansleep(gpio);
                }
 
                bdata->can_sleep = gpio_cansleep(gpio);

-               bdata->last_state = 0;
-               bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
+               bdata->last_state = -1;
+
+               if (bdev->polled)
+                       bdata->threshold = DIV_ROUND_UP(button->debounce_interval,

                                                pdata->poll_interval);
                                                pdata->poll_interval);

+               else
+                       bdata->threshold = 1;
+
+               bdata->b = &pdata->buttons[i];

        }
 
        bdev->dev = &pdev->dev;
        bdev->pdata = pdata;
        platform_set_drvdata(pdev, bdev);
 
        }
 
        bdev->dev = &pdev->dev;
        bdev->pdata = pdata;
        platform_set_drvdata(pdev, bdev);
 

-       INIT_DELAYED_WORK(&bdev->work, gpio_keys_polled_poll);
-
-       gpio_keys_polled_open(bdev);
+       *_bdev = bdev;

 
        return 0;
 
        return 0;

+}

 
 

-err_free_gpio:
-       while (--i >= 0)
-               gpio_free(pdata->buttons[i].gpio);
+static int gpio_keys_probe(struct platform_device *pdev)
+{
+       struct gpio_keys_platform_data *pdata;
+       struct gpio_keys_button_dev *bdev;
+       int ret, i;

 
 

-       kfree(bdev);
-       platform_set_drvdata(pdev, NULL);

 
 

-err_free_pdata:
-       /* If we have no platform_data, we allocated pdata dynamically.  */
-       if (!dev_get_platdata(&pdev->dev))
-               kfree(pdata);
+       ret = gpio_keys_button_probe(pdev, &bdev, 0);
+
+       if (ret)
+               return ret;
+
+       pdata = pdev->dev.platform_data;
+       for (i = 0; i < pdata->nbuttons; i++) {
+               struct gpio_keys_button *button = &pdata->buttons[i];
+               struct gpio_keys_button_data *bdata = &bdev->data[i];
+
+               if (!button->irq)
+                       button->irq = gpio_to_irq(button->gpio);
+               if (button->irq < 0) {
+                       dev_err(&pdev->dev, "failed to get irq for gpio:%d\n", button->gpio);
+                       continue;
+               }

 
 

-       return error;
+               ret = devm_request_threaded_irq(&pdev->dev, button->irq, NULL, button_handle_irq,
+                                               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                               dev_name(&pdev->dev), bdata);
+               if (ret < 0)
+                       dev_err(&pdev->dev, "failed to request irq:%d for gpio:%d\n", button->irq, button->gpio);
+               else
+                       dev_dbg(&pdev->dev, "gpio:%d has irq:%d\n", button->gpio, button->irq);
+
+               if (bdata->b->type == EV_SW)
+                       button_hotplug_event(bdata, EV_SW, gpio_button_get_value(bdata));
+       }
+
+       return 0;

 }
 
 }
 

-static int gpio_keys_polled_remove(struct platform_device *pdev)
+static int gpio_keys_polled_probe(struct platform_device *pdev)

 {
 {

-       struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev);
-       struct gpio_keys_platform_data *pdata = bdev->pdata;
-       int i = pdata->nbuttons;
+       struct gpio_keys_platform_data *pdata;
+       struct gpio_keys_button_dev *bdev;
+       int ret;
+       int i;
+
+       ret = gpio_keys_button_probe(pdev, &bdev, 1);
+
+       if (ret)
+               return ret;

 
 

-       gpio_keys_polled_close(bdev);
+       INIT_DELAYED_WORK(&bdev->work, gpio_keys_polled_poll);
+
+       pdata = bdev->pdata;
+
+       if (pdata->enable)
+               pdata->enable(bdev->dev);
+
+       for (i = 0; i < pdata->nbuttons; i++)
+               gpio_keys_polled_check_state(&bdev->data[i]);

 
 

-       while (--i >= 0)
-               gpio_free(pdata->buttons[i].gpio);
+       gpio_keys_polled_queue_work(bdev);
+
+       return ret;
+}
+
+static int gpio_keys_remove(struct platform_device *pdev)
+{
+       struct gpio_keys_button_dev *bdev = platform_get_drvdata(pdev);

 
 

-       kfree(bdev);

        platform_set_drvdata(pdev, NULL);
 
        platform_set_drvdata(pdev, NULL);
 

+       if (bdev->polled)
+               gpio_keys_polled_close(bdev);
+

        return 0;
 }
 
        return 0;
 }
 

+static struct platform_driver gpio_keys_driver = {
+       .probe  = gpio_keys_probe,
+       .remove = gpio_keys_remove,
+       .driver = {
+               .name   = "gpio-keys",
+               .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(gpio_keys_of_match),
+       },
+};
+

 static struct platform_driver gpio_keys_polled_driver = {
        .probe  = gpio_keys_polled_probe,
 static struct platform_driver gpio_keys_polled_driver = {
        .probe  = gpio_keys_polled_probe,

-       .remove = gpio_keys_polled_remove,
+       .remove = gpio_keys_remove,

        .driver = {
        .driver = {

-               .name   = DRV_NAME,
+               .name   = "gpio-keys-polled",

                .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(gpio_keys_polled_of_match),
        },
 };
 
                .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(gpio_keys_polled_of_match),
        },
 };
 

-static int __init gpio_keys_polled_init(void)
+static int __init gpio_button_init(void)

 {
 {

-       return platform_driver_register(&gpio_keys_polled_driver);
+       int ret;
+
+       ret = platform_driver_register(&gpio_keys_driver);
+       if (ret)
+               return ret;
+
+       ret = platform_driver_register(&gpio_keys_polled_driver);
+       if (ret)
+               platform_driver_unregister(&gpio_keys_driver);
+
+       return ret;

 }
 
 }
 

-static void __exit gpio_keys_polled_exit(void)
+static void __exit gpio_button_exit(void)

 {
 {

+       platform_driver_unregister(&gpio_keys_driver);

        platform_driver_unregister(&gpio_keys_polled_driver);
 }
 
        platform_driver_unregister(&gpio_keys_polled_driver);
 }
 

-module_init(gpio_keys_polled_init);
-module_exit(gpio_keys_polled_exit);
+module_init(gpio_button_init);
+module_exit(gpio_button_exit);

 
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
 
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");