p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Corentin Labbe 2018-09-18 07:33:13 +00:00 committed by David S. Miller
parent 94b2bb28db
commit 2208e9a7e9
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/neterion/s2io.c
View File

@ -75,6 +75,7 @@
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <net/tcp.h> #include <net/tcp.h>

22
drivers/net/ethernet/neterion/s2io.h
View File

@ -10,6 +10,7 @@
* system is licensed under the GPL. * system is licensed under the GPL.
* See the file COPYING in this distribution for more information. * See the file COPYING in this distribution for more information.
************************************************************************/ ************************************************************************/
#include <linux/io-64-nonatomic-lo-hi.h>
#ifndef _S2IO_H #ifndef _S2IO_H
#define _S2IO_H #define _S2IO_H
@ -970,27 +971,6 @@ struct s2io_nic {
#define RESET_ERROR 1 #define RESET_ERROR 1
#define CMD_ERROR 2 #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 * Some registers have to be written in a particular order to
* expect correct hardware operation. The macro SPECIAL_REG_WRITE * expect correct hardware operation. The macro SPECIAL_REG_WRITE