Input: pixcir_i2c_ts - get rid of pdata->attb_read_val()

Get rid of the attb_read_val() platform hook. Instead, read the ATTB gpio
directly from the driver.

Fail if valid ATTB gpio is not provided by patform data.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 6c6f6dacb8582fe58fdf362aaeb44bfa6315a111..f2c0ae18e24a1ab54e8de73575901d9643be3541 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -24,6 +24,7 @@
 #include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/input/pixcir_ts.h>
+#include <linux/gpio.h>
 
 struct pixcir_i2c_ts_data {
        struct i2c_client *client;
@@ -87,11 +88,12 @@ static void pixcir_ts_poscheck(struct pixcir_i2c_ts_data *data)
 static irqreturn_t pixcir_ts_isr(int irq, void *dev_id)
 {
        struct pixcir_i2c_ts_data *tsdata = dev_id;
+       const struct pixcir_ts_platform_data *pdata = tsdata->chip;
 
        while (tsdata->running) {
                pixcir_ts_poscheck(tsdata);
 
-               if (tsdata->chip->attb_read_val())
+               if (gpio_get_value(pdata->gpio_attb))
                        break;
 
                msleep(20);
@@ -298,6 +300,11 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
+       if (!gpio_is_valid(pdata->gpio_attb)) {
+               dev_err(dev, "Invalid gpio_attb in pdata\n");
+               return -EINVAL;
+       }
+
        tsdata = devm_kzalloc(dev, sizeof(*tsdata), GFP_KERNEL);
        if (!tsdata)
                return -ENOMEM;
@@ -328,6 +335,13 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
 
        input_set_drvdata(input, tsdata);
 
+       error = devm_gpio_request_one(dev, pdata->gpio_attb,
+                                     GPIOF_DIR_IN, "pixcir_i2c_attb");
+       if (error) {
+               dev_err(dev, "Failed to request ATTB gpio\n");
+               return error;
+       }
+
        error = devm_request_threaded_irq(dev, client->irq, NULL, pixcir_ts_isr,
                                          IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                          client->name, tsdata);

diff --git a/include/linux/input/pixcir_ts.h b/include/linux/input/pixcir_ts.h
index 7942804464d3efa1f626ec562a0887872f7b0862..160cf353aa3968a5fdec476890f1c34214007f4e 100644 (file)
--- a/include/linux/input/pixcir_ts.h
+++ b/include/linux/input/pixcir_ts.h
@@ -44,9 +44,9 @@ enum pixcir_int_mode {
 #define PIXCIR_INT_POL_HIGH    (1UL << 2)
 
 struct pixcir_ts_platform_data {
-       int (*attb_read_val)(void);
        int x_max;
        int y_max;
+       int gpio_attb;          /* GPIO connected to ATTB line */
 };
 
 #endif