Input: gpio_keys - add hooks to enable/disable device

Allow platform code to specify callbcks that will be invoked when
input device is opened or closed, allowing, for example, to enable
the device.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index a9fd147f2ba744150bae9d7f4f763b70700302c2..6069abe31e42b0b4a8f17cf0f08ac91ff4de3fe4 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -39,6 +39,8 @@ struct gpio_keys_drvdata {
        struct input_dev *input;
        struct mutex disable_lock;
        unsigned int n_buttons;
+       int (*enable)(struct device *dev);
+       void (*disable)(struct device *dev);
        struct gpio_button_data data[0];
 };
 
@@ -423,6 +425,21 @@ fail2:
        return error;
 }
 
+static int gpio_keys_open(struct input_dev *input)
+{
+       struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
+
+       return ddata->enable ? ddata->enable(input->dev.parent) : 0;
+}
+
+static void gpio_keys_close(struct input_dev *input)
+{
+       struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
+
+       if (ddata->disable)
+               ddata->disable(input->dev.parent);
+}
+
 static int __devinit gpio_keys_probe(struct platform_device *pdev)
 {
        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
@@ -444,13 +461,18 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
        ddata->input = input;
        ddata->n_buttons = pdata->nbuttons;
+       ddata->enable = pdata->enable;
+       ddata->disable = pdata->disable;
        mutex_init(&ddata->disable_lock);
 
        platform_set_drvdata(pdev, ddata);
+       input_set_drvdata(input, ddata);
 
        input->name = pdev->name;
        input->phys = "gpio-keys/input0";
        input->dev.parent = &pdev->dev;
+       input->open = gpio_keys_open;
+       input->close = gpio_keys_close;
 
        input->id.bustype = BUS_HOST;
        input->id.vendor = 0x0001;

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index cd0b3f30f48ed1bc8294ac759bf7965b3efce851..ce73a30113b4d0181ef7a2131c060ca18f1de027 100644 (file)
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -17,6 +17,8 @@ struct gpio_keys_platform_data {
        struct gpio_keys_button *buttons;
        int nbuttons;
        unsigned int rep:1;             /* enable input subsystem auto repeat */
+       int (*enable)(struct device *dev);
+       void (*disable)(struct device *dev);
 };
 
 #endif