]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Input: ili210x - drop platform data support
authorMarek Vasut <marex@denx.de>
Thu, 7 Feb 2019 05:53:48 +0000 (21:53 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Feb 2019 06:17:42 +0000 (22:17 -0800)
There is not a single user of the ili210x platform data in the kernel,
just drop it.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/ili210x.c
include/linux/input/ili210x.h [deleted file]

index 6f76eeedf4652eecdf2c6a24ec6440d504dafb82..25b0ca6c07d9b0143ecd93d9fb32c69682c88114 100644 (file)
@@ -6,7 +6,6 @@
 #include <linux/input/mt.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
-#include <linux/input/ili210x.h>
 
 #define MAX_TOUCHES            2
 #define DEFAULT_POLL_PERIOD    20
@@ -184,7 +183,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
                                       const struct i2c_device_id *id)
 {
        struct device *dev = &client->dev;
-       const struct ili210x_platform_data *pdata = dev_get_platdata(dev);
        struct ili210x *priv;
        struct input_dev *input;
        struct panel_info panel;
@@ -194,11 +192,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 
        dev_dbg(dev, "Probing for ILI210X I2C Touschreen driver");
 
-       if (!pdata) {
-               dev_err(dev, "No platform data!\n");
-               return -EINVAL;
-       }
-
        if (client->irq <= 0) {
                dev_err(dev, "No IRQ!\n");
                return -EINVAL;
@@ -233,8 +226,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 
        priv->client = client;
        priv->input = input;
-       priv->get_pendown_state = pdata->get_pendown_state;
-       priv->poll_period = pdata->poll_period ? : DEFAULT_POLL_PERIOD;
+       priv->poll_period = DEFAULT_POLL_PERIOD;
        INIT_DELAYED_WORK(&priv->dwork, ili210x_work);
 
        /* Setup input device */
@@ -258,7 +250,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, priv);
 
-       error = request_irq(client->irq, ili210x_irq, pdata->irq_flags,
+       error = request_irq(client->irq, ili210x_irq, 0,
                            client->name, priv);
        if (error) {
                dev_err(dev, "Unable to request touchscreen IRQ, err: %d\n",
diff --git a/include/linux/input/ili210x.h b/include/linux/input/ili210x.h
deleted file mode 100644 (file)
index b76e7c1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ILI210X_H
-#define _ILI210X_H
-
-struct ili210x_platform_data {
-       unsigned long irq_flags;
-       unsigned int poll_period;
-       bool (*get_pendown_state)(void);
-};
-
-#endif