aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:38:30 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:14:07 -0500
commit4ec031166f6a466a443f462e567f7551096b1741 (patch)
tree2f59cd620ddd83436a16c8e5a494d6147a398716 /drivers
parentb81831c69afb82c0545d3de729290fab4e50d429 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/3c503.c3
-rw-r--r--drivers/net/ac3200.c3
-rw-r--r--drivers/net/e2100.c3
-rw-r--r--drivers/net/es3210.c2
-rw-r--r--drivers/net/smc-mca.c3
-rw-r--r--drivers/net/smc-ultra.c3
-rw-r--r--drivers/net/smc-ultra32.c3
-rw-r--r--drivers/net/wd.c2
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
600 count -= semi_count; 600 count -= semi_count;
601 memcpy_fromio(skb->data + semi_count, base + ei_status.priv, count); 601 memcpy_fromio(skb->data + semi_count, base + ei_status.priv, count);
602 } else { 602 } else {
603 /* Packet is in one chunk -- we can copy + cksum. */ 603 memcpy_fromio(skb->data, base + ring_offset, count);
604 eth_io_copy_and_sum(skb, base + ring_offset, count, 0);
605 } 604 }
606 return; 605 return;
607 } 606 }
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
327 memcpy_fromio(skb->data + semi_count, 327 memcpy_fromio(skb->data + semi_count,
328 ei_status.mem + TX_PAGES*256, count); 328 ei_status.mem + TX_PAGES*256, count);
329 } else { 329 } else {
330 /* Packet is in one chunk -- we can copy + cksum. */ 330 memcpy_fromio(skb->data, start, count);
331 eth_io_copy_and_sum(skb, start, count, 0);
332 } 331 }
333} 332}
334 333
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
355 355
356 mem_on(ioaddr, shared_mem, (ring_offset>>8)); 356 mem_on(ioaddr, shared_mem, (ring_offset>>8));
357 357
358 /* Packet is always in one chunk -- we can copy + cksum. */ 358 memcpy_fromio(skb->data, ei_status.mem + (ring_offset & 0xff), count);
359 eth_io_copy_and_sum(skb, ei_status.mem + (ring_offset & 0xff), count, 0);
360 359
361 mem_off(ioaddr); 360 mem_off(ioaddr);
362} 361}
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
375 memcpy_fromio(skb->data + semi_count, ei_status.mem, count); 375 memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
376 } else { 376 } else {
377 /* Packet is in one chunk. */ 377 /* Packet is in one chunk. */
378 eth_io_copy_and_sum(skb, xfer_start, count, 0); 378 memcpy_fromio(skb->data, xfer_start, count);
379 } 379 }
380} 380}
381 381
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
482 count -= semi_count; 482 count -= semi_count;
483 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count); 483 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
484 } else { 484 } else {
485 /* Packet is in one chunk -- we can copy + cksum. */ 485 memcpy_fromio(skb->data, xfer_start, count);
486 eth_io_copy_and_sum(skb, xfer_start, count, 0);
487 } 486 }
488 487
489} 488}
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
454 count -= semi_count; 454 count -= semi_count;
455 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count); 455 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
456 } else { 456 } else {
457 /* Packet is in one chunk -- we can copy + cksum. */ 457 memcpy_fromio(skb->data, xfer_start, count);
458 eth_io_copy_and_sum(skb, xfer_start, count, 0);
459 } 458 }
460 459
461 outb(0x00, dev->base_addr - ULTRA_NIC_OFFSET); /* Disable memory. */ 460 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,
395 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count); 395 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
396 } 396 }
397 } else { 397 } else {
398 /* Packet is in one chunk -- we can copy + cksum. */ 398 memcpy_fromio(skb->data, xfer_start, count);
399 eth_io_copy_and_sum(skb, xfer_start, count, 0);
400 } 399 }
401} 400}
402 401
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_
433 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count); 433 memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
434 } else { 434 } else {
435 /* Packet is in one chunk -- we can copy + cksum. */ 435 /* Packet is in one chunk -- we can copy + cksum. */
436 eth_io_copy_and_sum(skb, xfer_start, count, 0); 436 memcpy_fromio(skb->data, xfer_start, count);
437 } 437 }
438 438
439 /* Turn off 16 bit access so that reboot works. ISA brain-damage */ 439 /* Turn off 16 bit access so that reboot works. ISA brain-damage */