kill eth_io_copy_and_sum()
Subsystems (2)
PATCH 1/1 kill eth_io_copy_and_sum()
On all targets that sucker boils down to memcpy_fromio(sbk->data, from, len). The function name is highly misguiding (it _never_ does any checksums), the last argument is just a noise and simply expanding the call to memcpy_fromio() gives shorter and more readable source. For a lot of reasons it has almost no remaining users, so it's better to just outright kill it.
Signed-off-by Al Viro <[email protected]>
--- drivers/net/3c503.c | 3 +-- drivers/net/ac3200.c | 3 +-- drivers/net/e2100.c | 3 +-- drivers/net/es3210.c | 2 +- drivers/net/smc-mca.c | 3 +-- drivers/net/smc-ultra.c | 3 +-- drivers/net/smc-ultra32.c | 3 +-- drivers/net/wd.c | 2 +- include/asm-alpha/io.h | 9 --------- include/asm-arm/arch-ixp4xx/io.h | 3 --- include/asm-arm/io.h | 5 ----- include/asm-cris/io.h | 5 ----- include/asm-i386/io.h | 6 ------ include/asm-mips/io.h | 6 ------ include/asm-parisc/io.h | 9 --------- include/asm-ppc/io.h | 2 -- include/asm-x86_64/io.h | 6 ------ 17 files changed, 8 insertions(+), 65 deletions(-)
drivers/net/3c503.c +1 -2
@@ -600,8 +600,7 @@ el2_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring count -= semi_count;memcpy_fromio (skb->data + semi_count, base + ei_status.priv, count); }else { -/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, base + ring_offset, count,0 ); +memcpy_fromio (skb->data, base + ring_offset, count); }return ; }
drivers/net/ac3200.c +1 -2
@@ -327,8 +327,7 @@ static void ac_block_input(struct net_device *dev, int count, struct sk_buff *skmemcpy_fromio (skb->data + semi_count, ei_status.mem +TX_PAGES *256 , count); }else { -/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, start, count,0 ); +memcpy_fromio (skb->data, start, count); } }
drivers/net/e2100.c +1 -2
@@ -355,8 +355,7 @@ e21_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ringmem_on (ioaddr, shared_mem, (ring_offset>>8 )); -/* Packet is always in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, ei_status.mem + (ring_offset &0xff ), count,0 ); +memcpy_fromio (skb->data, ei_status.mem + (ring_offset &0xff ), count);mem_off (ioaddr); }
drivers/net/es3210.c +1 -1
@@ -375,7 +375,7 @@ static void es_block_input(struct net_device *dev, int count, struct sk_buff *skmemcpy_fromio (skb->data + semi_count, ei_status.mem, count); }else {/* Packet is in one chunk. */ -eth_io_copy_and_sum (skb, xfer_start, count,0 ); +memcpy_fromio (skb->data, xfer_start, count); } }
drivers/net/smc-mca.c +1 -2
@@ -482,8 +482,7 @@ static void ultramca_block_input(struct net_device *dev, int count, struct sk_bu count -= semi_count;memcpy_fromio (skb->data + semi_count, ei_status.mem +TX_PAGES *256 , count); }else { -/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, xfer_start, count,0 ); +memcpy_fromio (skb->data, xfer_start, count); } }
drivers/net/smc-ultra.c +1 -2
@@ -454,8 +454,7 @@ ultra_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ri count -= semi_count;memcpy_fromio (skb->data + semi_count, ei_status.mem +TX_PAGES *256 , count); }else { -/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, xfer_start, count,0 ); +memcpy_fromio (skb->data, xfer_start, count); }outb (0x00 , dev->base_addr -ULTRA_NIC_OFFSET );/* Disable memory. */
drivers/net/smc-ultra32.c +1 -2
@@ -395,8 +395,7 @@ static void ultra32_block_input(struct net_device *dev,memcpy_fromio (skb->data + semi_count, ei_status.mem +TX_PAGES *256 , count); } }else { -/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, xfer_start, count,0 ); +memcpy_fromio (skb->data, xfer_start, count); } }
drivers/net/wd.c +1 -1
@@ -433,7 +433,7 @@ wd_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_memcpy_fromio (skb->data + semi_count, ei_status.mem +TX_PAGES *256 , count); }else {/* Packet is in one chunk -- we can copy + cksum. */ -eth_io_copy_and_sum (skb, xfer_start, count,0 ); +memcpy_fromio (skb->data, xfer_start, count); }/* Turn off 16 bit access so that reboot works. ISA brain-damage */
include/asm-alpha/io.h +0 -9
@@ -525,15 +525,6 @@ extern void outsw (unsigned long port, const void *src, unsigned long count);extern void outsl (unsigned long port,const void *src,unsigned long count);/* -* XXX - We don't have csum_partial_copy_fromio() yet, so we cheat here and -* just copy it. The net code will then do the checksum later. Presently -* only used by some shared memory 8390 Ethernet cards anyway. -*/ - -#define eth_io_copy_and_sum (skb,src,len,unused) \ - memcpy_fromio((skb)->data,src,len) - -/* * The Alpha Jensen hardware for some rather strange reason puts * the RTC clock at 0x170 instead of 0x70. Probably due to some * misguided idea about using 0x70 for NMI stuff.
include/asm-arm/arch-ixp4xx/io.h +0 -3
@@ -238,9 +238,6 @@ __ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count)#define memcpy_fromio (a,c,l) _memcpy_fromio((a),(c),(l))#define memcpy_toio (c,a,l) _memcpy_toio((c),(a),(l)) -#define eth_io_copy_and_sum (s,c,l,b) \ - eth_copy_and_sum((s),__mem_pci(c),(l),(b)) -static inline int check_signature (const unsigned char __iomem *bus_addr,const unsigned char *signature,int length)
include/asm-arm/io.h +0 -5
@@ -182,9 +182,6 @@ extern void _memset_io(volatile void __iomem *, int, size_t);#define memcpy_fromio (a,c,l) _memcpy_fromio((a),__mem_pci(c),(l))#define memcpy_toio (c,a,l) _memcpy_toio(__mem_pci(c),(a),(l)) -#define eth_io_copy_and_sum (s,c,l,b) \ - eth_copy_and_sum((s),__mem_pci(c),(l),(b)) -#elif !defined(readb)#define readb (c) (__readwrite_bug("readb"),0)
@@ -194,8 +191,6 @@ extern void _memset_io(volatile void __iomem *, int, size_t);#define writew (v,c) __readwrite_bug("writew")#define writel (v,c) __readwrite_bug("writel") -#define eth_io_copy_and_sum (s,c,l,b) __readwrite_bug("eth_io_copy_and_sum") -#define check_signature (io,sig,len) (0)#endif /* __mem_pci */
include/asm-cris/io.h +0 -5
@@ -121,11 +121,6 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)#define memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) -/* -* Again, CRIS does not require mem IO specific function. -*/ - -#define eth_io_copy_and_sum (a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d))/* The following is junk needed for the arch-independent code but which * we never use in the CRIS port
include/asm-i386/io.h +0 -6
@@ -219,12 +219,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))/* -* Again, i386 does not require mem IO specific function. -*/ - -#define eth_io_copy_and_sum (a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d)) - -/* * Cache management * * This needed for two cases
include/asm-mips/io.h +0 -6
@@ -556,12 +556,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);#define __ISA_IO_base ((char *)(isa_slot_offset))/* -* We don't have csum_partial_copy_fromio() yet, so we cheat here and -* just copy it. The net code will then do the checksum later. -*/ -#define eth_io_copy_and_sum (skb,src,len,unused) memcpy_fromio((skb)->data,(src),(len)) - -/* * The caches on some architectures aren't dma-coherent and have need to * handle this in software. There are three types of operations that * can be applied to dma buffers.
include/asm-parisc/io.h +0 -9
@@ -191,15 +191,6 @@ void memset_io(volatile void __iomem *addr, unsigned char val, int count);void memcpy_fromio (void *dst,const volatile void __iomem *src,int count);void memcpy_toio (volatile void __iomem *dst,const void *src,int count); -/* -* XXX - We don't have csum_partial_copy_fromio() yet, so we cheat here and -* just copy it. The net code will then do the checksum later. Presently -* only used by some shared memory 8390 Ethernet cards anyway. -*/ - -#define eth_io_copy_and_sum (skb,src,len,unused) \ - memcpy_fromio((skb)->data,(src),(len)) -/* Port-space IO */ #define inb_p inb
include/asm-ppc/io.h +0 -2
@@ -358,8 +358,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int }#endif -#define eth_io_copy_and_sum (a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d)) -/* * Map in an area of physical address space, for accessing * I/O devices etc.
include/asm-x86_64/io.h +0 -6
@@ -248,12 +248,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);*/ #define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET)) -/* -* Again, x86-64 does not require mem IO specific function. -*/ - -#define eth_io_copy_and_sum (a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d)) -/* Nothing to do */ #define dma_cache_inv (_start,_size) do { } while (0)
Signature · 1 line
1.5.0-rc2.GIT