diff options
author | Hartley Sweeten <hartleys@visionengravers.com> | 2009-07-13 14:50:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-17 08:35:55 -0400 |
commit | 5b1c3c858cff4da95b9f7091eef424e706784cab (patch) | |
tree | 96612283c3467c9c402026f38e806de3b50df2ed /arch/arm/mach-ep93xx | |
parent | d19d36672ee379f26b79df985a9a2e5afb3f1df1 (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 68ac0545f570..4c38941a92c7 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -541,10 +541,8 @@ static struct platform_device ep93xx_eth_device = { | |||
541 | 541 | ||
542 | void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) | 542 | void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) |
543 | { | 543 | { |
544 | if (copy_addr) { | 544 | if (copy_addr) |
545 | memcpy(data->dev_addr, | 545 | memcpy_fromio(data->dev_addr, EP93XX_ETHERNET_BASE + 0x50, 6); |
546 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
547 | } | ||
548 | 546 | ||
549 | ep93xx_eth_data = *data; | 547 | ep93xx_eth_data = *data; |
550 | platform_device_register(&ep93xx_eth_device); | 548 | platform_device_register(&ep93xx_eth_device); |