From mboxrd@z Thu Jan 1 00:00:00 1970 From: Corentin Labbe Subject: [PATCH 2/2] net: neterion: s2io: Use linux/io-64-nonatomic-lo-hi.h Date: Fri, 14 Sep 2018 10:33:10 +0000 Message-ID: <1536921190-38619-3-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-wr1-f67.google.com ([209.85.221.67]:33978 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728236AbeINPrP (ORCPT ); Fri, 14 Sep 2018 11:47:15 -0400 Received: by mail-wr1-f67.google.com with SMTP id g33-v6so10030342wrd.1 for ; Fri, 14 Sep 2018 03:33:21 -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/s2io.c | 1 + drivers/net/ethernet/neterion/s2io.h | 22 +--------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index b8983e7..44acc63 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h index 1a24a72..0a921f3 100644 --- a/drivers/net/ethernet/neterion/s2io.h +++ b/drivers/net/ethernet/neterion/s2io.h @@ -10,6 +10,7 @@ * system is licensed under the GPL. * See the file COPYING in this distribution for more information. ************************************************************************/ +#include #ifndef _S2IO_H #define _S2IO_H @@ -970,27 +971,6 @@ struct s2io_nic { #define RESET_ERROR 1 #define CMD_ERROR 2 -/* OS related system calls */ -#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 - /* * Some registers have to be written in a particular order to * expect correct hardware operation. The macro SPECIAL_REG_WRITE -- 2.7.4