From mboxrd@z Thu Jan 1 00:00:00 1970 From: Corentin Labbe Subject: [PATCH 1/2] net: neterion: vxge: use linux/io-64-nonatomic-lo-hi.h Date: Fri, 14 Sep 2018 10:33:09 +0000 Message-ID: <1536921190-38619-2-git-send-email-clabbe@baylibre.com> References: <1536921190-38619-1-git-send-email-clabbe@baylibre.com> Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Corentin Labbe To: davem@davemloft.net, jdmason@kudzu.us Return-path: Received: from mail-wm1-f67.google.com ([209.85.128.67]:51665 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727994AbeINPrO (ORCPT ); Fri, 14 Sep 2018 11:47:14 -0400 Received: by mail-wm1-f67.google.com with SMTP id y2-v6so1427677wma.1 for ; Fri, 14 Sep 2018 03:33:20 -0700 (PDT) In-Reply-To: <1536921190-38619-1-git-send-email-clabbe@baylibre.com> Sender: netdev-owner@vger.kernel.org List-ID: This patch replace the custom definition of writeq/read and use ones defined in linux/io-64-nonatomic-lo-hi.h. Signed-off-by: Corentin Labbe --- drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 + drivers/net/ethernet/neterion/vxge/vxge-config.h | 20 -------------------- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 1 + 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c index 358ed61..2b422c5 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c @@ -13,6 +13,7 @@ ******************************************************************************/ #include #include +#include #include #include #include diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h index d743a37..e678ba3 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.h +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h @@ -2011,26 +2011,6 @@ enum vxge_hw_status vxge_hw_vpath_mtu_set( void vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp); -#ifndef readq -static inline u64 readq(void __iomem *addr) -{ - u64 ret = 0; - ret = readl(addr + 4); - ret <<= 32; - ret |= readl(addr); - - return ret; -} -#endif - -#ifndef writeq -static inline void writeq(u64 val, void __iomem *addr) -{ - writel((u32) (val), addr); - writel((u32) (val >> 32), (addr + 4)); -} -#endif - static inline void __vxge_hw_pio_mem_write32_upper(u32 val, void __iomem *addr) { writel(val, addr + 4); diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c index 0c3b5de..30e5cdc 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c @@ -12,6 +12,7 @@ * Copyright(c) 2002-2010 Exar Corp. ******************************************************************************/ #include +#include #include #include "vxge-traffic.h" -- 2.7.4