9 files changed, 127 insertions, 153 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 2d70089c1183..3b9758b5f4d7 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -909,6 +909,7 @@ config TOUCHSCREEN_STMPE
 config TOUCHSCREEN_TPS6507X
         tristate "TPS6507x based touchscreens"
         depends on I2C
+        select INPUT_POLLDEV
         help
           Say Y here if you have a TPS6507x based touchscreen
           controller.
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index 580004049b9e..d038575f49db 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -153,7 +153,7 @@ static int cyttsp4_hw_reset(struct cyttsp4 *cd)
  */
 static int cyttsp4_bits_2_bytes(unsigned int nbits, size_t *max)
 {
-        *max = 1 << nbits;
+        *max = 1UL << nbits;
         return (nbits + 7) / 8;
 }
 
@@ -1447,11 +1447,6 @@ static void cyttsp4_watchdog_work(struct work_struct *work)
         u8 *mode;
         int retval;
 
-        if (cd == NULL) {
-                dev_err(cd->dev, "%s: NULL context pointer\n", __func__);
-                return;
-        }
-
         mutex_lock(&cd->system_lock);
         retval = cyttsp4_load_status_regs(cd);
         if (retval < 0) {
@@ -2027,7 +2022,7 @@ struct cyttsp4 *cyttsp4_probe(const struct cyttsp4_bus_ops *ops,
         if (!cd->xfer_buf) {
                 dev_err(dev, "%s: Error, kzalloc\n", __func__);
                 rc = -ENOMEM;
-                goto error_alloc_data;
+                goto error_free_cd;
         }
 
         /* Initialize device info */
@@ -2051,7 +2046,7 @@ struct cyttsp4 *cyttsp4_probe(const struct cyttsp4_bus_ops *ops,
         cd->irq = gpio_to_irq(cd->cpdata->irq_gpio);
         if (cd->irq < 0) {
                 rc = -EINVAL;
-                goto error_gpio_irq;
+                goto error_free_xfer;
         }
 
         dev_set_drvdata(dev, cd);
@@ -2119,7 +2114,9 @@ error_request_irq:
         if (cd->cpdata->init)
                 cd->cpdata->init(cd->cpdata, 0, dev);
         dev_set_drvdata(dev, NULL);
-error_gpio_irq:
+error_free_xfer:
+        kfree(cd->xfer_buf);
+error_free_cd:
         kfree(cd);
 error_alloc_data:
 error_no_pdata:
diff --git a/drivers/input/touchscreen/cyttsp4_core.h b/drivers/input/touchscreen/cyttsp4_core.h
index 86a254354136..8e0d4d490b20 100644
--- a/drivers/input/touchscreen/cyttsp4_core.h
+++ b/drivers/input/touchscreen/cyttsp4_core.h
@@ -369,9 +369,9 @@ struct cyttsp4 {
 
 struct cyttsp4_bus_ops {
         u16 bustype;
-        int (*write)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+        int (*write)(struct device *dev, u8 *xfer_buf, u16 addr, u8 length,
                         const void *values);
-        int (*read)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+        int (*read)(struct device *dev, u8 *xfer_buf, u16 addr, u8 length,
                         void *values);
 };
 
@@ -448,13 +448,13 @@ enum cyttsp4_event_id {
 /* y-axis, 0:origin is on top side of panel, 1: bottom */
 #define CY_PCFG_ORIGIN_Y_MASK           0x80
 
-static inline int cyttsp4_adap_read(struct cyttsp4 *ts, u8 addr, int size,
+static inline int cyttsp4_adap_read(struct cyttsp4 *ts, u16 addr, int size,
                 void *buf)
 {
         return ts->bus_ops->read(ts->dev, ts->xfer_buf, addr, size, buf);
 }
 
-static inline int cyttsp4_adap_write(struct cyttsp4 *ts, u8 addr, int size,
+static inline int cyttsp4_adap_write(struct cyttsp4 *ts, u16 addr, int size,
                 const void *buf)
 {
         return ts->bus_ops->write(ts->dev, ts->xfer_buf, addr, size, buf);
@@ -463,9 +463,9 @@ static inline int cyttsp4_adap_write(struct cyttsp4 *ts, u8 addr, int size,
 extern struct cyttsp4 *cyttsp4_probe(const struct cyttsp4_bus_ops *ops,
                 struct device *dev, u16 irq, size_t xfer_buf_size);
 extern int cyttsp4_remove(struct cyttsp4 *ts);
-int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf, u16 addr,
                 u8 length, const void *values);
-int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf, u16 addr,
                 u8 length, void *values);
 extern const struct dev_pm_ops cyttsp4_pm_ops;
 
diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c
index f8f891bead34..a71e1141d638 100644
--- a/drivers/input/touchscreen/cyttsp4_spi.c
+++ b/drivers/input/touchscreen/cyttsp4_spi.c
@@ -44,7 +44,7 @@
 #define CY_SPI_DATA_BUF_SIZE    (CY_SPI_CMD_BYTES + CY_SPI_DATA_SIZE)
 
 static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
-                           u8 op, u8 reg, u8 *buf, int length)
+                           u8 op, u16 reg, u8 *buf, int length)
 {
         struct spi_device *spi = to_spi_device(dev);
         struct spi_message msg;
@@ -63,14 +63,12 @@ static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
         memset(wr_buf, 0, CY_SPI_DATA_BUF_SIZE);
         memset(rd_buf, 0, CY_SPI_CMD_BYTES);
 
-        if (reg > 255)
-                wr_buf[0] = op + CY_SPI_A8_BIT;
-        else
-                wr_buf[0] = op;
-        if (op == CY_SPI_WR_OP)
-                wr_buf[1] = reg % 256;
-        if (op == CY_SPI_WR_OP && length > 0)
-                memcpy(wr_buf + CY_SPI_CMD_BYTES, buf, length);
+        wr_buf[0] = op + (((reg >> 8) & 0x1) ? CY_SPI_A8_BIT : 0);
+        if (op == CY_SPI_WR_OP) {
+                wr_buf[1] = reg & 0xFF;
+                if (length > 0)
+                        memcpy(wr_buf + CY_SPI_CMD_BYTES, buf, length);
+        }
 
         memset(xfer, 0, sizeof(xfer));
         spi_message_init(&msg);
@@ -130,7 +128,7 @@ static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
 }
 
 static int cyttsp_spi_read_block_data(struct device *dev, u8 *xfer_buf,
-                                      u8 addr, u8 length, void *data)
+                                      u16 addr, u8 length, void *data)
 {
         int rc;
 
@@ -143,7 +141,7 @@ static int cyttsp_spi_read_block_data(struct device *dev, u8 *xfer_buf,
 }
 
 static int cyttsp_spi_write_block_data(struct device *dev, u8 *xfer_buf,
-                                       u8 addr, u8 length, const void *data)
+                                       u16 addr, u8 length, const void *data)
 {
         return cyttsp_spi_xfer(dev, xfer_buf, CY_SPI_WR_OP, addr, (void *)data,
                         length);
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index 4824fa343897..d53e0b72a407 100644
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -118,6 +118,15 @@ static int ttsp_send_command(struct cyttsp *ts, u8 cmd)
         return ttsp_write_block_data(ts, CY_REG_BASE, sizeof(cmd), &cmd);
 }
 
+static int cyttsp_handshake(struct cyttsp *ts)
+{
+        if (ts->pdata->use_hndshk)
+                return ttsp_send_command(ts,
+                                ts->xy_data.hst_mode ^ CY_HNDSHK_BIT);
+
+        return 0;
+}
+
 static int cyttsp_load_bl_regs(struct cyttsp *ts)
 {
         memset(&ts->bl_data, 0, sizeof(ts->bl_data));
@@ -135,7 +144,7 @@ static int cyttsp_exit_bl_mode(struct cyttsp *ts)
         memcpy(bl_cmd, bl_command, sizeof(bl_command));
         if (ts->pdata->bl_keys)
                 memcpy(&bl_cmd[sizeof(bl_command) - CY_NUM_BL_KEYS],
-                        ts->pdata->bl_keys, sizeof(bl_command));
+                        ts->pdata->bl_keys, CY_NUM_BL_KEYS);
 
         error = ttsp_write_block_data(ts, CY_REG_BASE,
                                       sizeof(bl_cmd), bl_cmd);
@@ -169,6 +178,10 @@ static int cyttsp_set_operational_mode(struct cyttsp *ts)
         if (error)
                 return error;
 
+        error = cyttsp_handshake(ts);
+        if (error)
+                return error;
+
         return ts->xy_data.act_dist == CY_ACT_DIST_DFLT ? -EIO : 0;
 }
 
@@ -190,6 +203,10 @@ static int cyttsp_set_sysinfo_mode(struct cyttsp *ts)
         if (error)
                 return error;
 
+        error = cyttsp_handshake(ts);
+        if (error)
+                return error;
+
         if (!ts->sysinfo_data.tts_verh && !ts->sysinfo_data.tts_verl)
                 return -EIO;
 
@@ -346,12 +363,9 @@ static irqreturn_t cyttsp_irq(int irq, void *handle)
                 goto out;
 
         /* provide flow control handshake */
-        if (ts->pdata->use_hndshk) {
-                error = ttsp_send_command(ts,
-                                ts->xy_data.hst_mode ^ CY_HNDSHK_BIT);
-                if (error)
-                        goto out;
-        }
+        error = cyttsp_handshake(ts);
+        if (error)
+                goto out;
 
         if (unlikely(ts->state == CY_IDLE_STATE))
                 goto out;
diff --git a/drivers/input/touchscreen/cyttsp_core.h b/drivers/input/touchscreen/cyttsp_core.h
index d0c9e488b05d..07074110a902 100644
--- a/drivers/input/touchscreen/cyttsp_core.h
+++ b/drivers/input/touchscreen/cyttsp_core.h
@@ -67,8 +67,8 @@ struct cyttsp_xydata {
 /* TTSP System Information interface definition */
 struct cyttsp_sysinfo_data {
         u8 hst_mode;
-        u8 mfg_cmd;
         u8 mfg_stat;
+        u8 mfg_cmd;
         u8 cid[3];
         u8 tt_undef1;
         u8 uid[8];
@@ -112,9 +112,9 @@ struct cyttsp;
 
 struct cyttsp_bus_ops {
         u16 bustype;
-        int (*write)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+        int (*write)(struct device *dev, u8 *xfer_buf, u16 addr, u8 length,
                         const void *values);
-        int (*read)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+        int (*read)(struct device *dev, u8 *xfer_buf, u16 addr, u8 length,
                         void *values);
 };
 
@@ -145,9 +145,9 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
                             struct device *dev, int irq, size_t xfer_buf_size);
 void cyttsp_remove(struct cyttsp *ts);
 
-int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf, u16 addr,
                 u8 length, const void *values);
-int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf, u16 addr,
                 u8 length, void *values);
 extern const struct dev_pm_ops cyttsp_pm_ops;
 
diff --git a/drivers/input/touchscreen/cyttsp_i2c_common.c b/drivers/input/touchscreen/cyttsp_i2c_common.c
index 07c553fbcef2..1d7b6f154168 100644
--- a/drivers/input/touchscreen/cyttsp_i2c_common.c
+++ b/drivers/input/touchscreen/cyttsp_i2c_common.c
@@ -32,18 +32,20 @@
 #include <linux/types.h>
 
 int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf,
-                                      u8 addr, u8 length, void *values)
+                                      u16 addr, u8 length, void *values)
 {
         struct i2c_client *client = to_i2c_client(dev);
+        u8 client_addr = client->addr | ((addr >> 8) & 0x1);
+        u8 addr_lo = addr & 0xFF;
         struct i2c_msg msgs[] = {
                 {
-                        .addr = client->addr,
+                        .addr = client_addr,
                         .flags = 0,
                         .len = 1,
-                        .buf = &addr,
+                        .buf = &addr_lo,
                 },
                 {
-                        .addr = client->addr,
+                        .addr = client_addr,
                         .flags = I2C_M_RD,
                         .len = length,
                         .buf = values,
@@ -60,17 +62,29 @@ int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf,
 EXPORT_SYMBOL_GPL(cyttsp_i2c_read_block_data);
 
 int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf,
-                                       u8 addr, u8 length, const void *values)
+                                       u16 addr, u8 length, const void *values)
 {
         struct i2c_client *client = to_i2c_client(dev);
+        u8 client_addr = client->addr | ((addr >> 8) & 0x1);
+        u8 addr_lo = addr & 0xFF;
+        struct i2c_msg msgs[] = {
+                {
+                        .addr = client_addr,
+                        .flags = 0,
+                        .len = length + 1,
+                        .buf = xfer_buf,
+                },
+        };
         int retval;
 
-        xfer_buf[0] = addr;
+        xfer_buf[0] = addr_lo;
         memcpy(&xfer_buf[1], values, length);
 
-        retval = i2c_master_send(client, xfer_buf, length + 1);
+        retval = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+        if (retval < 0)
+                return retval;
 
-        return retval < 0 ? retval : 0;
+        return retval != ARRAY_SIZE(msgs) ? -EIO : 0;
 }
 EXPORT_SYMBOL_GPL(cyttsp_i2c_write_block_data);
 
diff --git a/drivers/input/touchscreen/cyttsp_spi.c b/drivers/input/touchscreen/cyttsp_spi.c
index 1df625337b84..4728bcb1916c 100644
--- a/drivers/input/touchscreen/cyttsp_spi.c
+++ b/drivers/input/touchscreen/cyttsp_spi.c
@@ -41,7 +41,7 @@
 #define CY_SPI_BITS_PER_WORD    8
 
 static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
-                           u8 op, u8 reg, u8 *buf, int length)
+                           u8 op, u16 reg, u8 *buf, int length)
 {
         struct spi_device *spi = to_spi_device(dev);
         struct spi_message msg;
@@ -126,14 +126,14 @@ static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
 }
 
 static int cyttsp_spi_read_block_data(struct device *dev, u8 *xfer_buf,
-                                      u8 addr, u8 length, void *data)
+                                      u16 addr, u8 length, void *data)
 {
         return cyttsp_spi_xfer(dev, xfer_buf, CY_SPI_RD_OP, addr, data,
                         length);
 }
 
 static int cyttsp_spi_write_block_data(struct device *dev, u8 *xfer_buf,
-                                       u8 addr, u8 length, const void *data)
+                                       u16 addr, u8 length, const void *data)
 {
         return cyttsp_spi_xfer(dev, xfer_buf, CY_SPI_WR_OP, addr, (void *)data,
                         length);
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index 820a066c3b8a..94cde2cb1491 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -17,6 +17,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 #include <linux/input.h>
+#include <linux/input-polldev.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
@@ -38,20 +39,13 @@ struct ts_event {
 };
 
 struct tps6507x_ts {
-        struct input_dev        *input_dev;
         struct device           *dev;
+        struct input_polled_dev *poll_dev;
+        struct tps6507x_dev     *mfd;
         char                    phys[32];
-        struct delayed_work     work;
-        unsigned                polling;        /* polling is active */
         struct ts_event         tc;
-        struct tps6507x_dev     *mfd;
-        u16                     model;
-        unsigned                pendown;
-        int                     irq;
-        void                    (*clear_penirq)(void);
-        unsigned long           poll_period;    /* ms */
         u16                     min_pressure;
-        int                     vref;           /* non-zero to leave vref on */
+        bool                    pendown;
 };
 
 static int tps6507x_read_u8(struct tps6507x_ts *tsc, u8 reg, u8 *data)
@@ -161,18 +155,15 @@ static s32 tps6507x_adc_standby(struct tps6507x_ts *tsc)
         return ret;
 }
 
-static void tps6507x_ts_handler(struct work_struct *work)
+static void tps6507x_ts_poll(struct input_polled_dev *poll_dev)
 {
-        struct tps6507x_ts *tsc =  container_of(work,
-                                struct tps6507x_ts, work.work);
-        struct input_dev *input_dev = tsc->input_dev;
-        int pendown;
-        int schd;
-        int poll = 0;
+        struct tps6507x_ts *tsc = poll_dev->private;
+        struct input_dev *input_dev = poll_dev->input;
+        bool pendown;
         s32 ret;
 
-        ret =  tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
-                                       &tsc->tc.pressure);
+        ret = tps6507x_adc_conversion(tsc, TPS6507X_TSCMODE_PRESSURE,
+                                      &tsc->tc.pressure);
         if (ret)
                 goto done;
 
@@ -183,7 +174,7 @@ static void tps6507x_ts_handler(struct work_struct *work)
                 input_report_key(input_dev, BTN_TOUCH, 0);
                 input_report_abs(input_dev, ABS_PRESSURE, 0);
                 input_sync(input_dev);
-                tsc->pendown = 0;
+                tsc->pendown = false;
         }
 
         if (pendown) {
@@ -208,76 +199,69 @@ static void tps6507x_ts_handler(struct work_struct *work)
                 input_report_abs(input_dev, ABS_Y, tsc->tc.y);
                 input_report_abs(input_dev, ABS_PRESSURE, tsc->tc.pressure);
                 input_sync(input_dev);
-                tsc->pendown = 1;
-                poll = 1;
+                tsc->pendown = true;
         }
 
 done:
-        /* always poll if not using interrupts */
-        poll = 1;
-
-        if (poll) {
-                schd = schedule_delayed_work(&tsc->work,
-                                        msecs_to_jiffies(tsc->poll_period));
-                if (schd)
-                        tsc->polling = 1;
-                else {
-                        tsc->polling = 0;
-                        dev_err(tsc->dev, "re-schedule failed");
-                }
-        } else
-                tsc->polling = 0;
-
-        ret = tps6507x_adc_standby(tsc);
+        tps6507x_adc_standby(tsc);
 }
 
 static int tps6507x_ts_probe(struct platform_device *pdev)
 {
-        int error;
-        struct tps6507x_ts *tsc;
         struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
-        struct touchscreen_init_data *init_data;
+        const struct tps6507x_board *tps_board;
+        const struct touchscreen_init_data *init_data;
+        struct tps6507x_ts *tsc;
+        struct input_polled_dev *poll_dev;
         struct input_dev *input_dev;
-        struct tps6507x_board *tps_board;
-        int schd;
+        int error;
 
-        /**
+        /*
          * tps_board points to pmic related constants
          * coming from the board-evm file.
          */
-
-        tps_board = (struct tps6507x_board *)tps6507x_dev->dev->platform_data;
-
+        tps_board = dev_get_platdata(tps6507x_dev->dev);
         if (!tps_board) {
                 dev_err(tps6507x_dev->dev,
                         "Could not find tps6507x platform data\n");
-                return -EIO;
+                return -ENODEV;
         }
 
-        /**
+        /*
          * init_data points to array of regulator_init structures
          * coming from the board-evm file.
          */
-
         init_data = tps_board->tps6507x_ts_init_data;
 
         tsc = kzalloc(sizeof(struct tps6507x_ts), GFP_KERNEL);
         if (!tsc) {
                 dev_err(tps6507x_dev->dev, "failed to allocate driver data\n");
-                error = -ENOMEM;
-                goto err0;
+                return -ENOMEM;
         }
 
-        tps6507x_dev->ts = tsc;
         tsc->mfd = tps6507x_dev;
         tsc->dev = tps6507x_dev->dev;
-        input_dev = input_allocate_device();
-        if (!input_dev) {
-                dev_err(tsc->dev, "Failed to allocate input device.\n");
+        tsc->min_pressure = init_data ?
+                        init_data->min_pressure : TPS_DEFAULT_MIN_PRESSURE;
+
+        snprintf(tsc->phys, sizeof(tsc->phys),
+                 "%s/input0", dev_name(tsc->dev));
+
+        poll_dev = input_allocate_polled_device();
+        if (!poll_dev) {
+                dev_err(tsc->dev, "Failed to allocate polled input device.\n");
                 error = -ENOMEM;
-                goto err1;
+                goto err_free_mem;
         }
 
+        tsc->poll_dev = poll_dev;
+
+        poll_dev->private = tsc;
+        poll_dev->poll = tps6507x_ts_poll;
+        poll_dev->poll_interval = init_data ?
+                        init_data->poll_period : TSC_DEFAULT_POLL_PERIOD;
+
+        input_dev = poll_dev->input;
         input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
         input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
@@ -286,76 +270,42 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_10BIT, 0, 0);
 
         input_dev->name = "TPS6507x Touchscreen";
-        input_dev->id.bustype = BUS_I2C;
-        input_dev->dev.parent = tsc->dev;
-
-        snprintf(tsc->phys, sizeof(tsc->phys),
-                 "%s/input0", dev_name(tsc->dev));
         input_dev->phys = tsc->phys;
-
-        dev_dbg(tsc->dev, "device: %s\n", input_dev->phys);
-
-        input_set_drvdata(input_dev, tsc);
-
-        tsc->input_dev = input_dev;
-
-        INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
-
+        input_dev->dev.parent = tsc->dev;
+        input_dev->id.bustype = BUS_I2C;
         if (init_data) {
-                tsc->poll_period = init_data->poll_period;
-                tsc->vref = init_data->vref;
-                tsc->min_pressure = init_data->min_pressure;
                 input_dev->id.vendor = init_data->vendor;
                 input_dev->id.product = init_data->product;
                 input_dev->id.version = init_data->version;
-        } else {
-                tsc->poll_period = TSC_DEFAULT_POLL_PERIOD;
-                tsc->min_pressure = TPS_DEFAULT_MIN_PRESSURE;
         }
 
         error = tps6507x_adc_standby(tsc);
         if (error)
-                goto err2;
+                goto err_free_polled_dev;
 
-        error = input_register_device(input_dev);
+        error = input_register_polled_device(poll_dev);
         if (error)
-                goto err2;
+                goto err_free_polled_dev;
 
-        schd = schedule_delayed_work(&tsc->work,
-                                     msecs_to_jiffies(tsc->poll_period));
-
-        if (schd)
-                tsc->polling = 1;
-        else {
-                tsc->polling = 0;
-                dev_err(tsc->dev, "schedule failed");
-                goto err2;
-         }
-        platform_set_drvdata(pdev, tps6507x_dev);
+        platform_set_drvdata(pdev, tsc);
 
         return 0;
 
-err2:
-        cancel_delayed_work_sync(&tsc->work);
-        input_free_device(input_dev);
-err1:
+err_free_polled_dev:
+        input_free_polled_device(poll_dev);
+err_free_mem:
         kfree(tsc);
-        tps6507x_dev->ts = NULL;
-err0:
         return error;
 }
 
 static int tps6507x_ts_remove(struct platform_device *pdev)
 {
-        struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
-        struct tps6507x_ts *tsc = tps6507x_dev->ts;
-        struct input_dev *input_dev = tsc->input_dev;
-
-        cancel_delayed_work_sync(&tsc->work);
+        struct tps6507x_ts *tsc = platform_get_drvdata(pdev);
+        struct input_polled_dev *poll_dev = tsc->poll_dev;
 
-        input_unregister_device(input_dev);
+        input_unregister_polled_device(poll_dev);
+        input_free_polled_device(poll_dev);
 
-        tps6507x_dev->ts = NULL;
         kfree(tsc);
 
         return 0;