Commit fdd1445b authored by Corentin Labbe's avatar Corentin Labbe Committed by David S. Miller
Browse files

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: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2208e9a7

drivers/net/ethernet/neterion/vxge/vxge-config.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/net/ethernet/neterion/vxge/vxge-config.h

+0 −20
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/neterion/vxge/vxge-traffic.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE