Input: hp_sdc - convert to ktime_get()

This gets rid of the deprecated do_gettimeofday() call in favor
of ktime_get(), which is also more reliable as it uses monotonic
times. The code now gets a bit simpler.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Patchwork-Id: 10076621
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 1d7c7d81a5ef4f5d8d8bdc8b359714430cc1e06e..0b8a25c58d02e65865aabfceca26444c93b7aa4a 100644 (file)
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -193,7 +193,7 @@ static void hp_sdc_take(int irq, void *dev_id, uint8_t status, uint8_t data)
        curr->seq[curr->idx++] = status;
        curr->seq[curr->idx++] = data;
        hp_sdc.rqty -= 2;
-       do_gettimeofday(&hp_sdc.rtv);
+       hp_sdc.rtime = ktime_get();
 
        if (hp_sdc.rqty <= 0) {
                /* All data has been gathered. */
@@ -306,13 +306,10 @@ static void hp_sdc_tasklet(unsigned long foo)
        write_lock_irq(&hp_sdc.rtq_lock);
 
        if (hp_sdc.rcurr >= 0) {
-               struct timeval tv;
+               ktime_t now = ktime_get();
 
-               do_gettimeofday(&tv);
-               if (tv.tv_sec > hp_sdc.rtv.tv_sec)
-                       tv.tv_usec += USEC_PER_SEC;
-
-               if (tv.tv_usec - hp_sdc.rtv.tv_usec > HP_SDC_MAX_REG_DELAY) {
+               if (ktime_after(now, ktime_add_us(hp_sdc.rtime,
+                                                 HP_SDC_MAX_REG_DELAY))) {
                        hp_sdc_transaction *curr;
                        uint8_t tmp;
 
@@ -321,8 +318,8 @@ static void hp_sdc_tasklet(unsigned long foo)
                         * we'll need to figure out a way to communicate
                         * it back to the application. and be less verbose.
                         */
-                       printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
-                              (int)(tv.tv_usec - hp_sdc.rtv.tv_usec));
+                       printk(KERN_WARNING PREFIX "read timeout (%lldus)!\n",
+                              ktime_us_delta(now, hp_sdc.rtime));
                        curr->idx += hp_sdc.rqty;
                        hp_sdc.rqty = 0;
                        tmp = curr->seq[curr->actidx];
@@ -551,7 +548,7 @@ unsigned long hp_sdc_put(void)
 
                        /* Start a new read */
                        hp_sdc.rqty = curr->seq[curr->idx];
-                       do_gettimeofday(&hp_sdc.rtv);
+                       hp_sdc.rtime = ktime_get();
                        curr->idx++;
                        /* Still need to lock here in case of spurious irq. */
                        write_lock_irq(&hp_sdc.rtq_lock);

diff --git a/include/linux/hp_sdc.h b/include/linux/hp_sdc.h
index d392975d888704b4c6854f1ebea948d436736265..6f1dee7e67e068663ab26e288fe1c93c912ecb3c 100644 (file)
--- a/include/linux/hp_sdc.h
+++ b/include/linux/hp_sdc.h
@@ -281,7 +281,7 @@ typedef struct {
        hp_sdc_transaction *tq[HP_SDC_QUEUE_LEN]; /* All pending read/writes */
 
        int             rcurr, rqty;    /* Current read transact in process */
-       struct timeval  rtv;            /* Time when current read started */
+       ktime_t         rtime;          /* Time when current read started */
        int             wcurr;          /* Current write transact in process */
 
        int             dev_err;        /* carries status from registration */