From patchwork Sat Oct 24 04:07:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingbo Wen X-Patchwork-Id: 55514 Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp27959lbq; Fri, 23 Oct 2015 21:08:08 -0700 (PDT) X-Received: by 10.66.232.40 with SMTP id tl8mr8895054pac.122.1445659688093; Fri, 23 Oct 2015 21:08:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12si34612650pat.32.2015.10.23.21.08.07 for ; Fri, 23 Oct 2015 21:08:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750934AbbJXEH3 (ORCPT ); Sat, 24 Oct 2015 00:07:29 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36319 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbbJXEH2 (ORCPT ); Sat, 24 Oct 2015 00:07:28 -0400 Received: by pacfv9 with SMTP id fv9so140727864pac.3 for ; Fri, 23 Oct 2015 21:07:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sHlWP0Z6HEsd1ViwKm645oK+2273t3vPzMvI0bxZAvQ=; b=EmbUcECwGe1qLn/7tbaQyAm5dmYIAaGwMziTm5Ub4d/yVw+A5KU3457QPUZgedT7u3 vG5kVNoJw2sCnIQqUeM/DWU58IixJMVPQnAdDiheByFsCUR8DAYawL42qj3e8az5LfAG PYfP9excyKVgMNfPJtA7pL2Eqd2VNf2V+SEDsUROdreBeiTT1KT6DDPtx+jk+Ce7X6q1 WyXq7V1fCz6ytb/Pb/kY/FBmC8rZd2D3GYcKOVmG3XpXs9y/abwbUXgrSGQQJBFiiuiN 4RwHCCHzlmoQuTOdWyjK0Hc08kSON6gnqNgvpvqsyMbVJJwz/nmFxRCfo2RQFwCjdZFq 3uog== X-Gm-Message-State: ALoCoQlOI3E4Kcbz9jWWw3ex/1fJZAu96nXeNQaQmpTlgRBc61nepLQq2wzd1CqCIhTATp3wOuA7 X-Received: by 10.68.191.194 with SMTP id ha2mr9044326pbc.3.1445659648357; Fri, 23 Oct 2015 21:07:28 -0700 (PDT) Received: from localhost.localdomain (edge03.meizu.com. [202.130.115.78]) by smtp.gmail.com with ESMTPSA id lo9sm21673909pab.19.2015.10.23.21.07.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Oct 2015 21:07:27 -0700 (PDT) From: WEN Pingbo To: arnd@arndb.de Cc: y2038@lists.linaro.org, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, WEN Pingbo Subject: [PATCH V4] hp_sdc: convert struct timeval to ktime_t Date: Sat, 24 Oct 2015 12:07:02 +0800 Message-Id: <1445659622-23337-1-git-send-email-pingbo.wen@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <3865085.z48HxzEQ2F@wuerfel> References: <3865085.z48HxzEQ2F@wuerfel> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org struct timeval is not y2038 safe, convert it to ktime_t, and there is no need to handle sec and usec separately And since hp_sdc.rtv is only used for time diff, monotonic time is better here Signed-off-by: WEN Pingbo --- Version 2: Using ktime_t instead of struct timespec64 Version 3: Commit msg adjustment, and using ktime_to_ns to extract nsecs Version 4: Correct commit msg format drivers/input/serio/hp_sdc.c | 16 ++++++---------- include/linux/hp_sdc.h | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 852858e..17e3725 100644 --- 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.rtv = ktime_get(); if (hp_sdc.rqty <= 0) { /* All data has been gathered. */ @@ -306,13 +306,9 @@ 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 time_diff = ktime_sub(ktime_get(), hp_sdc.rtv); - 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_to_ns(time_diff) > HP_SDC_MAX_REG_DELAY) { hp_sdc_transaction *curr; uint8_t tmp; @@ -321,8 +317,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 (%llins)!\n", + ktime_to_ns(time_diff)); curr->idx += hp_sdc.rqty; hp_sdc.rqty = 0; tmp = curr->seq[curr->actidx]; @@ -551,7 +547,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.rtv = 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 d392975..348a9b5 100644 --- a/include/linux/hp_sdc.h +++ b/include/linux/hp_sdc.h @@ -47,9 +47,9 @@ #endif -/* No 4X status reads take longer than this (in usec). +/* No 4X status reads take longer than this (in nsec). */ -#define HP_SDC_MAX_REG_DELAY 20000 +#define HP_SDC_MAX_REG_DELAY 20000000 typedef void (hp_sdc_irqhook) (int irq, void *dev_id, uint8_t status, uint8_t data); @@ -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 rtv; /* Time when current read started */ int wcurr; /* Current write transact in process */ int dev_err; /* carries status from registration */