mv643xx_eth: move mac_addr inside mv643xx_eth_platform_data

The information contained within platform_data should be self-contained.
Replace the pointer to a MAC address with the actual MAC address in
struct mv643xx_eth_platform_data.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 2 insertions, 10 deletions

diff --git a/arch/mips/momentum/ocelot_c/platform.c b/arch/mips/momentum/ocelot_c/platform.c
index fac8b2499387..f7cd303f3eba 100644
--- a/arch/mips/momentum/ocelot_c/platform.c
+++ b/arch/mips/momentum/ocelot_c/platform.c
@@ -46,11 +46,7 @@ static struct resource mv64x60_eth0_resources[] = {
         },
 };
 
-static char eth0_mac_addr[ETH_ALEN];
-
 static struct mv643xx_eth_platform_data eth0_pd = {
-        .mac_addr       = eth0_mac_addr,
-
         .tx_sram_addr   = MV_SRAM_BASE_ETH0,
         .tx_sram_size   = MV_SRAM_TXRING_SIZE,
         .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
@@ -79,11 +75,7 @@ static struct resource mv64x60_eth1_resources[] = {
         },
 };
 
-static char eth1_mac_addr[ETH_ALEN];
-
 static struct mv643xx_eth_platform_data eth1_pd = {
-        .mac_addr       = eth1_mac_addr,
-
         .tx_sram_addr   = MV_SRAM_BASE_ETH1,
         .tx_sram_size   = MV_SRAM_TXRING_SIZE,
         .tx_queue_size  = MV_SRAM_TXRING_SIZE / 16,
@@ -174,8 +166,8 @@ static int __init mv643xx_eth_add_pds(void)
         int ret;
 
         get_mac(mac);
-        eth_mac_add(eth0_mac_addr, mac, 0);
-        eth_mac_add(eth1_mac_addr, mac, 1);
+        eth_mac_add(eth0_pd.mac_addr, mac, 0);
+        eth_mac_add(eth1_pd.mac_addr, mac, 1);
         ret = platform_add_devices(mv643xx_eth_pd_devs,
                         ARRAY_SIZE(mv643xx_eth_pd_devs));