mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
[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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
b81831c69a
commit
4ec031166f
17 changed files with 8 additions and 65 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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. */
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue