u16                     model;
        u16                     x_plate_ohms;
        u16                     max_rt;
-       unsigned long           poll_period;
+       unsigned long           poll_period; /* in jiffies */
        int                     fuzzx;
        int                     fuzzy;
        int                     fuzzz;
                        dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt);
                }
 
-               wait_event_timeout(ts->wait, ts->stopped,
-                                  msecs_to_jiffies(ts->poll_period));
+               wait_event_timeout(ts->wait, ts->stopped, ts->poll_period);
        }
 
        dev_dbg(&ts->client->dev, "UP\n");
                ts->fuzzz = val32;
 
        if (!of_property_read_u64(np, "ti,poll-period", &val64))
-               ts->poll_period = val64;
+               ts->poll_period = msecs_to_jiffies(val64);
        else
-               ts->poll_period = 1;
+               ts->poll_period = msecs_to_jiffies(1);
 
        if (!of_property_read_u32(np, "ti,x-plate-ohms", &val32)) {
                ts->x_plate_ohms = val32;
        ts->model             = pdata->model;
        ts->x_plate_ohms      = pdata->x_plate_ohms;
        ts->max_rt            = pdata->max_rt ? : MAX_12BIT;
-       ts->poll_period       = pdata->poll_period ? : 1;
+       ts->poll_period       = msecs_to_jiffies(pdata->poll_period ? : 1);
        ts->get_pendown_state = pdata->get_pendown_state;
        ts->clear_penirq      = pdata->clear_penirq;
        ts->fuzzx             = pdata->fuzzx;