Skip to content

Commit

Permalink
[ARM] 5600/1: ep93xx: core.c remove cast when copying dev_addr
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hartley Sweeten authored and Russell King committed Jul 17, 2009
1 parent d19d366 commit 5b1c3c8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/arm/mach-ep93xx/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5b1c3c8

Please sign in to comment.