Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec03116 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b81831c6

drivers/net/3c503.c

+1 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/net/e2100.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/es3210.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/net/smc-mca.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}



}