Commit 7e76798f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'neterion-use-linux-io-64-nonatomic-lo-hi-h' 



Corentin Labbe says:

====================
net: ethernet: neterion: use linux/io-64-nonatomic-lo-hi.h

This series remove usage of custom writeq/readq in favor of ones
defined in linux/io-64-nonatomic-lo-hi.h

This series is only compile tested.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 94b2bb28 fdd1445b

drivers/net/ethernet/neterion/s2io.c

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
#include <linux/tcp.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/slab.h>

#include <linux/prefetch.h>

#include <net/tcp.h>

drivers/net/ethernet/neterion/s2io.h

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

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