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, 4 insertions, 16 deletions

diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c
index 024aef25f372..b80733f0c66d 100644
--- a/arch/mips/momentum/ocelot_3/platform.c
+++ b/arch/mips/momentum/ocelot_3/platform.c
@@ -47,11 +47,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,
@@ -80,11 +76,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,
@@ -113,11 +105,7 @@ static struct resource mv64x60_eth2_resources[] = {
         },
 };
 
-static char eth2_mac_addr[ETH_ALEN];
-
-static struct mv643xx_eth_platform_data eth2_pd = {
-        .mac_addr       = eth2_mac_addr,
-};
+static struct mv643xx_eth_platform_data eth2_pd;
 
 static struct platform_device eth2_device = {
         .name           = MV643XX_ETH_NAME,
@@ -200,9 +188,9 @@ 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(eth2_mac_addr, mac, 2);
+        eth_mac_add(eth0_pd.mac_addr, mac, 0);
+        eth_mac_add(eth1_pd.mac_addr, mac, 1);
+        eth_mac_add(eth2_pd.mac_addr, mac, 2);
         ret = platform_add_devices(mv643xx_eth_pd_devs,
                         ARRAY_SIZE(mv643xx_eth_pd_devs));