Merge branch 'synaptics-rmi4' into next

[mirror_ubuntu-zesty-kernel.git] / drivers / input / rmi4 / rmi_i2c.c

diff --git a/drivers/input/rmi4/rmi_i2c.c b/drivers/input/rmi4/rmi_i2c.c
index 1ebc2c1debae31e5d1479466085a9d7fbcfc586f..082306d7c207993c71a898a4dd17583a55ba8b4d 100644 (file)
--- a/drivers/input/rmi4/rmi_i2c.c
+++ b/drivers/input/rmi4/rmi_i2c.c
@@ -9,7 +9,6 @@
 
 #include <linux/i2c.h>
 #include <linux/rmi.h>
-#include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
@@ -35,8 +34,6 @@ struct rmi_i2c_xport {
        struct mutex page_mutex;
        int page;
 
-       int irq;
-
        u8 *tx_buf;
        size_t tx_buf_size;
 
@@ -177,42 +174,6 @@ static const struct rmi_transport_ops rmi_i2c_ops = {
        .read_block     = rmi_i2c_read_block,
 };
 
-static irqreturn_t rmi_i2c_irq(int irq, void *dev_id)
-{
-       struct rmi_i2c_xport *rmi_i2c = dev_id;
-       struct rmi_device *rmi_dev = rmi_i2c->xport.rmi_dev;
-       int ret;
-
-       ret = rmi_process_interrupt_requests(rmi_dev);
-       if (ret)
-               rmi_dbg(RMI_DEBUG_XPORT, &rmi_dev->dev,
-                       "Failed to process interrupt request: %d\n", ret);
-
-       return IRQ_HANDLED;
-}
-
-static int rmi_i2c_init_irq(struct i2c_client *client)
-{
-       struct rmi_i2c_xport *rmi_i2c = i2c_get_clientdata(client);
-       int irq_flags = irqd_get_trigger_type(irq_get_irq_data(rmi_i2c->irq));
-       int ret;
-
-       if (!irq_flags)
-               irq_flags = IRQF_TRIGGER_LOW;
-
-       ret = devm_request_threaded_irq(&client->dev, rmi_i2c->irq, NULL,
-                       rmi_i2c_irq, irq_flags | IRQF_ONESHOT, client->name,
-                       rmi_i2c);
-       if (ret < 0) {
-               dev_warn(&client->dev, "Failed to register interrupt %d\n",
-                       rmi_i2c->irq);
-
-               return ret;
-       }
-
-       return 0;
-}
-
 #ifdef CONFIG_OF
 static const struct of_device_id rmi_i2c_of_match[] = {
        { .compatible = "syna,rmi4-i2c" },
@@ -255,8 +216,7 @@ static int rmi_i2c_probe(struct i2c_client *client,
        if (!client->dev.of_node && client_pdata)
                *pdata = *client_pdata;
 
-       if (client->irq > 0)
-               rmi_i2c->irq = client->irq;
+       pdata->irq = client->irq;
 
        rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Probing %s.\n",
                        dev_name(&client->dev));
@@ -321,10 +281,6 @@ static int rmi_i2c_probe(struct i2c_client *client,
        if (retval)
                return retval;
 
-       retval = rmi_i2c_init_irq(client);
-       if (retval < 0)
-               return retval;
-
        dev_info(&client->dev, "registered rmi i2c driver at %#04x.\n",
                        client->addr);
        return 0;
@@ -337,18 +293,10 @@ static int rmi_i2c_suspend(struct device *dev)
        struct rmi_i2c_xport *rmi_i2c = i2c_get_clientdata(client);
        int ret;
 
-       ret = rmi_driver_suspend(rmi_i2c->xport.rmi_dev);
+       ret = rmi_driver_suspend(rmi_i2c->xport.rmi_dev, true);
        if (ret)
                dev_warn(dev, "Failed to resume device: %d\n", ret);
 
-       disable_irq(rmi_i2c->irq);
-       if (device_may_wakeup(&client->dev)) {
-               ret = enable_irq_wake(rmi_i2c->irq);
-               if (!ret)
-                       dev_warn(dev, "Failed to enable irq for wake: %d\n",
-                               ret);
-       }
-
        regulator_bulk_disable(ARRAY_SIZE(rmi_i2c->supplies),
                               rmi_i2c->supplies);
 
@@ -368,15 +316,7 @@ static int rmi_i2c_resume(struct device *dev)
 
        msleep(rmi_i2c->startup_delay);
 
-       enable_irq(rmi_i2c->irq);
-       if (device_may_wakeup(&client->dev)) {
-               ret = disable_irq_wake(rmi_i2c->irq);
-               if (!ret)
-                       dev_warn(dev, "Failed to disable irq for wake: %d\n",
-                               ret);
-       }
-
-       ret = rmi_driver_resume(rmi_i2c->xport.rmi_dev);
+       ret = rmi_driver_resume(rmi_i2c->xport.rmi_dev, true);
        if (ret)
                dev_warn(dev, "Failed to resume device: %d\n", ret);
 
@@ -391,12 +331,10 @@ static int rmi_i2c_runtime_suspend(struct device *dev)
        struct rmi_i2c_xport *rmi_i2c = i2c_get_clientdata(client);
        int ret;
 
-       ret = rmi_driver_suspend(rmi_i2c->xport.rmi_dev);
+       ret = rmi_driver_suspend(rmi_i2c->xport.rmi_dev, false);
        if (ret)
                dev_warn(dev, "Failed to resume device: %d\n", ret);
 
-       disable_irq(rmi_i2c->irq);
-
        regulator_bulk_disable(ARRAY_SIZE(rmi_i2c->supplies),
                               rmi_i2c->supplies);
 
@@ -416,9 +354,7 @@ static int rmi_i2c_runtime_resume(struct device *dev)
 
        msleep(rmi_i2c->startup_delay);
 
-       enable_irq(rmi_i2c->irq);
-
-       ret = rmi_driver_resume(rmi_i2c->xport.rmi_dev);
+       ret = rmi_driver_resume(rmi_i2c->xport.rmi_dev, false);
        if (ret)
                dev_warn(dev, "Failed to resume device: %d\n", ret);