From patchwork Wed Jul 11 12:29:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141731 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp229069ljj; Wed, 11 Jul 2018 05:30:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdCyZ3H7TU2N8Ttkoc5k7r+ZTl8z3F/4SxPiFcrBHo/l70pr5/9WKcfoL5rDwSeSXLzttN0 X-Received: by 2002:a65:5348:: with SMTP id w8-v6mr22254906pgr.247.1531312233848; Wed, 11 Jul 2018 05:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531312233; cv=none; d=google.com; s=arc-20160816; b=t1o65sMA3meuxMhCrihDUjB/QVU9orGpjfKfC+HNZiUldouKegO1dnYZJwEIApGWpe OWQdRO0HoG3bhdf0DY2eG2ip/eUTZyRqNlqczYPsBnf52arWAd027TFSE/SngW3mzA/1 wJhYgOe7VLMMjpnGc+ngWGhqkmNWlcTjoC5ETnI8j4ho0bwQke8kkMuPm4pKDjISE5bN Lrcv93ofyCUr3Mm0N+6d0n4bvuyBilisUJvvel+y11VPBD0kOimOL4IccAve4YFt12M7 lpHBE0n/VapzyN4mHbeoNTZUBjUkRzi6mo8AukOtD3AynT/ILsWP6sVGM8qnJ9shWF6p pOqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9PZczrw06uS4SGSfXwpCkmVyxV/3glh2YdqE1+bkFQg=; b=E1fvoKMTbNVUFKClMtmW5E/IP4gpArCyrs1Wevo3RP/97SPj09fz9A30/cgDXTvTDT TmBQXYkAuSLuGBiEsA9bTQdE0DRLhXf0bxQ5QoqQgZiDSh8S3zhJ0NhkiH1dwyyWiY0w JQFGLFe0d7DgCZCEkngkHhK/OPIk1w0I/7yYFyZuNj/uQS+Rafl1ClyHfgRA5vAX+4NV Efb+c0EPp/mGvEhM7dOXfjg3ETb6zXFr7cMwm4iMM50shMsiJhA2bEOtt2/fiHugArXH 32a6a0oblV+9hXVAfj9cSd++K0FRctVwTsfDtFXxqVGOWjLpeMdEJzOgLheTGUDzPre9 DfOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f18-v6si18030022pgd.16.2018.07.11.05.30.33; Wed, 11 Jul 2018 05:30:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387393AbeGKMeg (ORCPT + 23 others); Wed, 11 Jul 2018 08:34:36 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:46999 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732286AbeGKMeg (ORCPT ); Wed, 11 Jul 2018 08:34:36 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZsqM-1fND0L0E4U-00LXUS; Wed, 11 Jul 2018 14:30:07 +0200 From: Arnd Bergmann To: Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi , "David S. Miller" Cc: Arnd Bergmann , Intiyaz Basha , Rick Farrington , Veerasenareddy Burru , Vijaya Mohan Guvva , Weilin Chang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] [RESEND] liquidio: use ktime_get_real_ts64() instead of getnstimeofday64() Date: Wed, 11 Jul 2018 14:29:52 +0200 Message-Id: <20180711123003.453442-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:f0Gc1creoeJGRDRruAZySEn3SVXoLVoHTVCD04Mh+oydOkGUi64 yBU+MGkbfQA6TPR02Lfrxhl80TDD+U0uzhzKseDcQalm/sS3TD1FJicDxyxx6e+TDl+NMwY 2pqdv07W8u1PK2q8BwPCV4i2LAO3bAL3KDJS6owp5WBq/Mnpk5TL0JT0AvBi+Hrhmpe7WEn OTPogzWahdrTicgbkXZ6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:uP4fpjTe0Kc=:VIjAXcw2DJNanSxM8UK5hW vYJLL7mQKjwr9qSCPjIGANvlxp+GGMBQXcG91YDcIO/Hl1K35Ezg5wkLZzWUGQ3/BWyIiRiTd 4ogR9sv8K0dfWbZwolVGCKgji0iqitc1+lFNk8xlZw2WffjChXBoRxTQrlw2KzA3cEbe6RvjZ AAGhPTNmp7ZATgb5mV5WxAenW2JxTHsVubGHgY6+AKHnhSqDdGmwxmeMTIMIGNDag9gDAYwxg Z2gvh3vMSAZlgOsczhqQZ3pSoXrPTFPrGnEQ7WtCXjtulrj4LCZamSIZMeCU5NgZI51qHB/1e m3+t10s8Xy+AbTviaWpB9Uuc/5cT7+ozWbODFFZFXrjm3LjVMIRLA/Byk6QqsdaaWomtH/JkK 9OpRGunnC0CEsi8cPNhjKimaif86cKEep2brpNakN9kYq04HJdxd3N5WwpYCUfMt35sPKQIbt l/U0L+VeA9lNkvGaNShAr6vhp8dnzfnlMNKd1vDlmYXOcIhPYnEIHjIalv73btLKMM8J1okGz NPzRRhABDH2A1vaHJToB/XpSQjuScZEiWnC2wlBfKxvGygOSJQcNCaZXPz8XIedvU/7+FGE3m TIyOs3gsTzK05RYoWwWP9aSxlQK2yEcf/iRugDRfY9k8CFAnzFylXF9XvVynlX+DF9Uv0um4f Llu0hnyGqO2xHScK51h6Kff6v9ASuylYGYlQ00h0Wz4Q6jjLRcvmiA3qLq7DUNhr8QPg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two do the same thing, but we want to have a consistent naming in the kernel. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/octeon_console.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Acked-by: Felix Manlunas diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 19d03fc24305..30884ad0a509 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -687,7 +687,7 @@ static void lio_sync_octeon_time(struct work_struct *work) lt = (struct lio_time *)sc->virtdptr; /* Get time of the day */ - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); lt->sec = ts.tv_sec; lt->nsec = ts.tv_nsec; octeon_swap_8B_data((u64 *)lt, (sizeof(struct lio_time)) / 8); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c index 7f97ae48efed..0cc2338d8d2a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -902,7 +902,7 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data, * * Octeon always uses UTC time. so timezone information is not sent. */ - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); ret = snprintf(boottime, MAX_BOOTTIME_SIZE, " time_sec=%lld time_nsec=%ld", (s64)ts.tv_sec, ts.tv_nsec);