[PATCH] 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 <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 files changed, 8 insertions, 14 deletions

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 7e34c4f07b70..bc7e906571d3 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -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;
     }
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index c01f87f5bed7..644c408515df 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -327,8 +327,7 @@ static void ac_block_input(struct net_device *dev, int count, struct sk_buff *sk
                 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, start, count, 0);
+                memcpy_fromio(skb->data, start, count);
         }
 }
 
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index c62d9c6363c6..b2b0a96218ca 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -355,8 +355,7 @@ e21_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring
 
         mem_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);
 }
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 2d2ea94a00bb..822e5bfd1a71 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -375,7 +375,7 @@ static void es_block_input(struct net_device *dev, int count, struct sk_buff *sk
                 memcpy_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);
         }
 }
 
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index 7122932eac90..ae1ae343beed 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -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);
         }
 
 }
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index d70bc9795346..a52b22d7db65 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -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. */
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 2c5319c62fa5..88a30e56c64c 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 7f38012b9c92..a0326818ff2f 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -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 */