summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-02-19 17:14:33 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-04-03 16:24:33 -0700
commit2d3884998945cf3f995e9c2e0f157b59f4ec3e86 (patch)
tree2152b20096b338722ec1e73a6ce9b9adf1ddd694 /drivers/input
parent6f9fab69a21d47ac68e78a8a5c613a2a6156bbb7 (diff)
Input: eeti_ts - respect interrupt set in client structure
Instead of expecting that GPIO is always interrupt source, let's use interrupt specified in I2C client. Reviewed-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/eeti_ts.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index e99e4fec93f5..ac78ac6d4936 100644
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -49,7 +49,7 @@ struct eeti_ts {
struct input_dev *input;
struct work_struct work;
struct mutex mutex;
- int irq_gpio, irq, irq_active_high;
+ int irq_gpio, irq_active_high;
};
#define EETI_TS_BITDEPTH (11)
@@ -128,7 +128,7 @@ static irqreturn_t eeti_ts_isr(int irq, void *dev_id)
static void eeti_ts_start(struct eeti_ts *eeti)
{
- enable_irq(eeti->irq);
+ enable_irq(eeti->client->irq);
/* Read the events once to arm the IRQ */
eeti_ts_read(&eeti->work);
@@ -136,7 +136,7 @@ static void eeti_ts_start(struct eeti_ts *eeti)
static void eeti_ts_stop(struct eeti_ts *eeti)
{
- disable_irq(eeti->irq);
+ disable_irq(eeti->client->irq);
cancel_work_sync(&eeti->work);
}
@@ -201,7 +201,6 @@ static int eeti_ts_probe(struct i2c_client *client,
eeti->client = client;
eeti->input = input;
eeti->irq_gpio = pdata->irq_gpio;
- eeti->irq = gpio_to_irq(pdata->irq_gpio);
error = devm_gpio_request_one(dev, pdata->irq_gpio, GPIOF_IN,
client->name);
@@ -221,7 +220,7 @@ static int eeti_ts_probe(struct i2c_client *client,
if (error)
return error;
- error = devm_request_irq(dev, eeti->irq, eeti_ts_isr, irq_flags,
+ error = devm_request_irq(dev, client->irq, eeti_ts_isr, irq_flags,
client->name, eeti);
if (error) {
dev_err(dev, "Unable to request touchscreen IRQ: %d\n",
@@ -252,7 +251,7 @@ static int __maybe_unused eeti_ts_suspend(struct device *dev)
mutex_unlock(&input_dev->mutex);
if (device_may_wakeup(&client->dev))
- enable_irq_wake(eeti->irq);
+ enable_irq_wake(client->irq);
return 0;
}
@@ -264,7 +263,7 @@ static int __maybe_unused eeti_ts_resume(struct device *dev)
struct input_dev *input_dev = eeti->input;
if (device_may_wakeup(&client->dev))
- disable_irq_wake(eeti->irq);
+ disable_irq_wake(client->irq);
mutex_lock(&input_dev->mutex);