diff options
| author | Corentin Labbe <clabbe@baylibre.com> | 2018-09-18 07:33:14 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 20:06:23 -0700 |
| commit | fdd1445b684a802a24fb1893ecdd254b64318e96 (patch) | |
| tree | 52cff1a837136342d54c5a18dfe9ab5bfee48587 /drivers/net/ethernet/neterion/vxge | |
| parent | 2208e9a7e94e3d7da8f1b5d8d57c1d0b154afd03 (diff) | |
| download | linux-fdd1445b684a802a24fb1893ecdd254b64318e96.tar.bz2 | |
net: neterion: vxge: 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 'drivers/net/ethernet/neterion/vxge')
| -rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-config.h | 20 | ||||
| -rw-r--r-- | 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 398011c87643..4c1fb7e57888 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c @@ -13,6 +13,7 @@ ******************************************************************************/ #include <linux/vmalloc.h> #include <linux/etherdevice.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/pci.h> #include <linux/slab.h> diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h index d743a37a3cee..e678ba379598 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 0c3b5dea2858..30e5cdc52eb6 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 <linux/etherdevice.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/prefetch.h> #include "vxge-traffic.h" |