* [PATCH] netxen: remove writeq/readq function definitions
@ 2017-06-02 11:36 Corentin Labbe
2017-06-04 23:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Corentin Labbe @ 2017-06-02 11:36 UTC (permalink / raw)
To: manish.chopra, rahul.verma, Dept-GELinuxNICDev
Cc: netdev, linux-kernel, Corentin Labbe
Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which
already have them.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index a996801d442d..66ff15d08bad 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -21,6 +21,7 @@
*
*/
+#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/slab.h>
#include "netxen_nic.h"
#include "netxen_nic_hw.h"
@@ -44,20 +45,6 @@ static void netxen_nic_io_write_128M(struct netxen_adapter *adapter,
void __iomem *addr, u32 data);
static u32 netxen_nic_io_read_128M(struct netxen_adapter *adapter,
void __iomem *addr);
-#ifndef readq
-static inline u64 readq(void __iomem *addr)
-{
- return readl(addr) | (((u64) readl(addr + 4)) << 32LL);
-}
-#endif
-
-#ifndef writeq
-static inline void writeq(u64 val, void __iomem *addr)
-{
- writel(((u32) (val)), (addr));
- writel(((u32) (val >> 32)), (addr + 4));
-}
-#endif
#define PCI_OFFSET_FIRST_RANGE(adapter, off) \
((adapter)->ahw.pci_base0 + (off))
--
2.13.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netxen: remove writeq/readq function definitions
2017-06-02 11:36 [PATCH] netxen: remove writeq/readq function definitions Corentin Labbe
@ 2017-06-04 23:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-06-04 23:54 UTC (permalink / raw)
To: clabbe.montjoie
Cc: manish.chopra, rahul.verma, Dept-GELinuxNICDev, netdev, linux-kernel
From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Fri, 2 Jun 2017 13:36:27 +0200
> Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which
> already have them.
>
> Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Applied to net-next.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-04 23:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 11:36 [PATCH] netxen: remove writeq/readq function definitions Corentin Labbe
2017-06-04 23:54 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.