Commit 5b1c3c85 authored Jul 13, 2009 by Hartley Sweeten Committed by Russell King Jul 17, 2009

[ARM] 5600/1: ep93xx: core.c remove cast when copying dev_addr



The MAC address for the ep93xx ethernet driver can be optionally
copied from registers in the controller when booting.  Due to
[ARM] 5573/1: ep93xx: ensure typesafe io, the cast for the source
address is no longer needed.

EP93XX_ETHERNET_BASE is typed as a (void __iomem __force *) so
memcpy_fromio() needs to be used instead of memcpy().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent d19d3667

arch/arm/mach-ep93xx/core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -541,10 +541,8 @@ static struct platform_device ep93xx_eth_device = {

		void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)
		{
		if (copy_addr) {
		memcpy(data->dev_addr,
		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
		}
		if (copy_addr)
		memcpy_fromio(data->dev_addr, EP93XX_ETHERNET_BASE + 0x50, 6);

		ep93xx_eth_data = *data;
		platform_device_register(&ep93xx_eth_device);