]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
netxen: remove writeq/readq function definitions
authorLABBE Corentin <clabbe.montjoie@gmail.com>
Fri, 2 Jun 2017 11:36:27 +0000 (13:36 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Jun 2017 23:53:58 +0000 (19:53 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c

index a996801d442dd87ed47e572355e497bde8f6c846..66ff15d08bad4eb0a12e30e69547905789d15336 100644 (file)
@@ -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))