diff options
| author |   Corentin Labbe <clabbe@baylibre.com> | 2018-09-18 07:33:13 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-18 20:06:23 -0700 |
| commit | 2208e9a7e94e3d7da8f1b5d8d57c1d0b154afd03 (patch) | |
| tree | 7881db7dbaa2c3972472e7d22fc064ad04047596 /drivers/net/ethernet/neterion/s2io.h | |
| parent | net: ibm: fix return type of ndo_start_xmit function (diff) | |
| download | linux-dev-2208e9a7e94e3d7da8f1b5d8d57c1d0b154afd03.tar.xz linux-dev-2208e9a7e94e3d7da8f1b5d8d57c1d0b154afd03.zip | |
net: neterion: s2io: Use linux/io-64-nonatomic-lo-hi.h
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 <clabbe@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/neterion/s2io.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h index 1a24a7218794..0a921f30f98f 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 <linux/io-64-nonatomic-lo-hi.h> #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 |