From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752451AbdJLJtC (ORCPT ); Thu, 12 Oct 2017 05:49:02 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:56400 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbdJLJs6 (ORCPT ); Thu, 12 Oct 2017 05:48:58 -0400 From: Arnd Bergmann To: Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Cc: Arnd Bergmann , "David S. Miller" , Intiyaz Basha , Rick Farrington , VSR Burru , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net] liquidio: fix timespec64_to_ns typo Date: Thu, 12 Oct 2017 11:48:31 +0200 Message-Id: <20171012094841.3178599-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:KpnuRFbBrBU5+HKZHPvSsNIC/MXnOByA5lc6ZGHLsgpinYrYZY4 q7CfDmYUK3q6+/uqzRjnVGiL6DhQdwcGuvY66qSdWq+griy5Jr8I15FQe1MRNDas+zCp3ee MsdQJgLA1IQA4iieZgB4VdLLUdfw/XxNR/B+rQtjL3+Hhq1FgSNK8IXpKKjS9CRO8BkY3ut grvHXPWflIyduz002ZmKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:kB8AaxqLafg=:rJd4EPPvSkkC9Gq/NAe0ee 5sORZpP6eQVXiavJqBRz5tpQ307TauRmOnRTTH9/Zk2X8CJRY5wcDv4LOwBUbNdqUTGxIlnKP XApriL6Aaq7LL6bxvjG7toF1D7fPVTUP3XYD3W7TKypz8iBqANZTzPqO1KCxMSdUh4ViItRoe 9xA5T4KleFqrCpJtXStKgkUAskKNOfSiRMH5ZtqK9O/57ucouJM16JZ1Jj9k9eQcQ2vx7JzrK hTP3fBaD7Q3QwxIfy5/a8bqXKDUupNmjT2ZJpcCwZ0KZXKBQcQ2jvX/o7M+iEAP48y2Sj72Sg jvce4RicyB0oLqk6NxPQ+STG6yoYcCMWNFbfsGpnPt159KrCBh1NmUcwPeMa8wQH8m5ttNG0d GaQHj1JWHgjm/6+gl5e4Wg+GThjpf1t0GZhcredfKhgBGUzi+s+aE49Vk0TVuiyDGwR1I8Pxt GLqE/O4qO5IwECx88BHM4c9xTKjLMM12Sa6E2/ADFADyqFDlJQ4BbQCXNbsDOIdf5UJTlc+x7 at5TKBphL6p0IfBBPjdwG11XsASjLzbH0qGlcoXxtvjdT8Zfy8d1nkSy93tjFZW/vpx6O+AlL isGUb7O7kiO8F4wlVSIdKPGaiYRc4yPZIep92sJPoT/n/6NA0OsO0vhDrPMr/sQ80O60/FTQh oTz5Gy4Sg2uPRJ6MhpuL2pb45aHIytJ91bBoZZu5HylHTzTBK8udLgGu+uPQiE2A8Hmm/SOJE iGhQWBNPCGqz9GFhwzS4b/5witre8NKOaWtJpw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While experimenting with changes to the timekeeping code, I ran into a build error in the liquidio driver: drivers/net/ethernet/cavium/liquidio/lio_main.c: In function 'liquidio_ptp_settime': drivers/net/ethernet/cavium/liquidio/lio_main.c:1850:22: error: passing argument 1 of 'timespec_to_ns' from incompatible pointer type [-Werror=incompatible-pointer-types] The driver had a type mismatch since it was first merged, but this never caused problems because it is only built on 64-bit architectures that define timespec and timespec64 to the same type. If we ever want to compile-test the driver on 32-bit or change the way that 64-bit timespec64 is defined, we need to fix it, so let's just do it now. Fixes: f21fb3ed364b ("Add support of Cavium Liquidio ethernet adapters") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 963803bc6633..eafae3eb4fed 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1847,7 +1847,7 @@ static int liquidio_ptp_settime(struct ptp_clock_info *ptp, struct lio *lio = container_of(ptp, struct lio, ptp_info); struct octeon_device *oct = (struct octeon_device *)lio->oct_dev; - ns = timespec_to_ns(ts); + ns = timespec64_to_ns(ts); spin_lock_irqsave(&lio->ptp_lock, flags); lio_pci_writeq(oct, ns, CN6XXX_MIO_PTP_CLOCK_HI); -- 2.9.0