diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-02-13 14:51:06 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-25 14:26:25 -0700 |
| commit | d9b6971b4e0d610ea6b132687fb1edfdf9c6b0c7 (patch) | |
| tree | 71b13d7f97f9c6e053e38bab64fbecea001225ac /drivers/input/touchscreen/rmi4 | |
| parent | e1d74cb52826b4052314c79166b7e581970a51a9 (diff) | |
Input: rmi4 - Remove use of irq_to_gpio
This function is being removed in v3.2. We're already calling
gpio_to_irq to generate the IRQ, so just use the original GPIO.
Change-Id: I4980c0b2772cacb7851d2ba085c064d11ed69b8f
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/input/touchscreen/rmi4')
| -rw-r--r-- | drivers/input/touchscreen/rmi4/rmi_i2c.c | 4 | ||||
| -rw-r--r-- | drivers/input/touchscreen/rmi4/rmi_spi.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/rmi4/rmi_i2c.c b/drivers/input/touchscreen/rmi4/rmi_i2c.c index 15624f9cf54b..8fd811e49578 100644 --- a/drivers/input/touchscreen/rmi4/rmi_i2c.c +++ b/drivers/input/touchscreen/rmi4/rmi_i2c.c @@ -54,9 +54,9 @@ static irqreturn_t rmi_i2c_irq_thread(int irq, void *p) #if IRQ_DEBUG dev_dbg(phys->dev, "ATTN gpio, value: %d.\n", - gpio_get_value(irq_to_gpio(irq))); + gpio_get_value(pdata->irq)); #endif - if (gpio_get_value(irq_to_gpio(irq)) == pdata->irq_polarity) { + if (gpio_get_value(pdata->irq) == pdata->irq_polarity) { phys->info.attn_count++; if (driver && driver->irq_handler && rmi_dev) driver->irq_handler(rmi_dev, irq); diff --git a/drivers/input/touchscreen/rmi4/rmi_spi.c b/drivers/input/touchscreen/rmi4/rmi_spi.c index 41f72657f829..d761bf9106b8 100644 --- a/drivers/input/touchscreen/rmi4/rmi_spi.c +++ b/drivers/input/touchscreen/rmi4/rmi_spi.c @@ -65,7 +65,7 @@ static irqreturn_t rmi_spi_hard_irq(int irq, void *p) struct rmi_device_platform_data *pdata = phys->dev->platform_data; if (data->split_read_pending && - gpio_get_value(irq_to_gpio(irq)) == pdata->irq_polarity) { + gpio_get_value(pdata->irq) == pdata->irq_polarity) { phys->info.attn_count++; complete(&data->irq_comp); return IRQ_HANDLED; @@ -81,7 +81,7 @@ static irqreturn_t rmi_spi_irq_thread(int irq, void *p) struct rmi_driver *driver = rmi_dev->driver; struct rmi_device_platform_data *pdata = phys->dev->platform_data; - if (gpio_get_value(irq_to_gpio(irq)) == pdata->irq_polarity) { + if (gpio_get_value(pdata->irq) == pdata->irq_polarity) { phys->info.attn_count++; if (driver && driver->irq_handler) driver->irq_handler(rmi_dev, irq); |