6 files changed, 21 insertions, 43 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index b93b5988ace8..9a647ee1136a 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -359,7 +359,7 @@ config TOUCHSCREEN_MCS5000
 
 config TOUCHSCREEN_MMS114
         tristate "MELFAS MMS114 touchscreen"
-        depends on I2C
+        depends on I2C && GENERIC_HARDIRQS
         help
           Say Y here if you have the MELFAS MMS114 touchscreen controller
           chip in your system.
diff --git a/drivers/input/touchscreen/cyttsp_spi.c b/drivers/input/touchscreen/cyttsp_spi.c
index 638e20310f12..861b7f77605b 100644
--- a/drivers/input/touchscreen/cyttsp_spi.c
+++ b/drivers/input/touchscreen/cyttsp_spi.c
@@ -193,7 +193,6 @@ static struct spi_driver cyttsp_spi_driver = {
 
 module_spi_driver(cyttsp_spi_driver);
 
-MODULE_ALIAS("spi:cyttsp");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cypress TrueTouch(R) Standard Product (TTSP) SPI driver");
 MODULE_AUTHOR("Cypress");
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c
index 98841d8aa635..4a29ddf6bf1e 100644
--- a/drivers/input/touchscreen/mms114.c
+++ b/drivers/input/touchscreen/mms114.c
@@ -429,12 +429,12 @@ static int mms114_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        data = kzalloc(sizeof(struct mms114_data), GFP_KERNEL);
-        input_dev = input_allocate_device();
+        data = devm_kzalloc(&client->dev, sizeof(struct mms114_data),
+                            GFP_KERNEL);
+        input_dev = devm_input_allocate_device(&client->dev);
         if (!data || !input_dev) {
                 dev_err(&client->dev, "Failed to allocate memory\n");
-                error = -ENOMEM;
-                goto err_free_mem;
+                return -ENOMEM;
         }
 
         data->client = client;
@@ -466,57 +466,36 @@ static int mms114_probe(struct i2c_client *client,
         input_set_drvdata(input_dev, data);
         i2c_set_clientdata(client, data);
 
-        data->core_reg = regulator_get(&client->dev, "avdd");
+        data->core_reg = devm_regulator_get(&client->dev, "avdd");
         if (IS_ERR(data->core_reg)) {
                 error = PTR_ERR(data->core_reg);
                 dev_err(&client->dev,
                         "Unable to get the Core regulator (%d)\n", error);
-                goto err_free_mem;
+                return error;
         }
 
-        data->io_reg = regulator_get(&client->dev, "vdd");
+        data->io_reg = devm_regulator_get(&client->dev, "vdd");
         if (IS_ERR(data->io_reg)) {
                 error = PTR_ERR(data->io_reg);
                 dev_err(&client->dev,
                         "Unable to get the IO regulator (%d)\n", error);
-                goto err_core_reg;
+                return error;
         }
 
-        error = request_threaded_irq(client->irq, NULL, mms114_interrupt,
-                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "mms114", data);
+        error = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+                        mms114_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                        dev_name(&client->dev), data);
         if (error) {
                 dev_err(&client->dev, "Failed to register interrupt\n");
-                goto err_io_reg;
+                return error;
         }
         disable_irq(client->irq);
 
         error = input_register_device(data->input_dev);
-        if (error)
-                goto err_free_irq;
-
-        return 0;
-
-err_free_irq:
-        free_irq(client->irq, data);
-err_io_reg:
-        regulator_put(data->io_reg);
-err_core_reg:
-        regulator_put(data->core_reg);
-err_free_mem:
-        input_free_device(input_dev);
-        kfree(data);
-        return error;
-}
-
-static int mms114_remove(struct i2c_client *client)
-{
-        struct mms114_data *data = i2c_get_clientdata(client);
-
-        free_irq(client->irq, data);
-        regulator_put(data->io_reg);
-        regulator_put(data->core_reg);
-        input_unregister_device(data->input_dev);
-        kfree(data);
+        if (error) {
+                dev_err(&client->dev, "Failed to register input device\n");
+                return error;
+        }
 
         return 0;
 }
@@ -590,7 +569,6 @@ static struct i2c_driver mms114_driver = {
                 .of_match_table = of_match_ptr(mms114_dt_match),
         },
         .probe          = mms114_probe,
-        .remove         = mms114_remove,
         .id_table       = mms114_id,
 };
 
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 84d884b4ec3e..59e81b00f244 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -120,6 +120,7 @@ static void stmpe_work(struct work_struct *work)
         __stmpe_reset_fifo(ts->stmpe);
 
         input_report_abs(ts->idev, ABS_PRESSURE, 0);
+        input_report_key(ts->idev, BTN_TOUCH, 0);
         input_sync(ts->idev);
 }
 
@@ -153,6 +154,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
         input_report_abs(ts->idev, ABS_X, x);
         input_report_abs(ts->idev, ABS_Y, y);
         input_report_abs(ts->idev, ABS_PRESSURE, z);
+        input_report_key(ts->idev, BTN_TOUCH, 1);
         input_sync(ts->idev);
 
        /* flush the FIFO after we have read out our values. */
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 9c0cdc7ea449..7213e8b07e79 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -753,3 +753,4 @@ module_spi_driver(tsc2005_driver);
 MODULE_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
 MODULE_DESCRIPTION("TSC2005 Touchscreen Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:tsc2005");
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index f88fab56178c..6be2eb6a153a 100644
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -247,7 +247,7 @@ static int wm831x_ts_probe(struct platform_device *pdev)
 
         wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts),
                                  GFP_KERNEL);
-        input_dev = input_allocate_device();
+        input_dev = devm_input_allocate_device(&pdev->dev);
         if (!wm831x_ts || !input_dev) {
                 error = -ENOMEM;
                 goto err_alloc;
@@ -376,7 +376,6 @@ err_pd_irq:
 err_data_irq:
         free_irq(wm831x_ts->data_irq, wm831x_ts);
 err_alloc:
-        input_free_device(input_dev);
 
         return error;
 }
@@ -387,7 +386,6 @@ static int wm831x_ts_remove(struct platform_device *pdev)
 
         free_irq(wm831x_ts->pd_irq, wm831x_ts);
         free_irq(wm831x_ts->data_irq, wm831x_ts);
-        input_unregister_device(wm831x_ts->input_dev);
 
         return 0;
 }