Cleanup for GCC-4.x

[karo-tx-uboot.git] / board / Marvell / db64360 / mv_eth.c

diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c
index e2719b99d1a50b450418205cd10f4b189004028a..2dd47bf501dfea3cd01de34edb3edb607c6c68bd 100644 (file)
--- a/board/Marvell/db64360/mv_eth.c
+++ b/board/Marvell/db64360/mv_eth.c
@@ -267,8 +267,9 @@ void mv6436x_eth_initialize (bd_t * bis)
                dev->send = (void *) db64360_eth_transmit;
                dev->recv = (void *) db64360_eth_poll;
 
-               dev->priv = (void *) ethernet_private =
-                       calloc (sizeof (*ethernet_private), 1);
+               ethernet_private = calloc (sizeof (*ethernet_private), 1);
+               dev->priv = (void *) ethernet_private;
+
                if (!ethernet_private) {
                        printf ("%s: %s allocation failure, %s\n",
                                __FUNCTION__, dev->name,
@@ -281,8 +282,8 @@ void mv6436x_eth_initialize (bd_t * bis)
                memcpy (ethernet_private->port_mac_addr, dev->enetaddr, 6);
 
                /* set pointer to memory for stats data structure etc... */
-               ethernet_private->port_private = (void *) port_private =
-                       calloc (sizeof (*ethernet_private), 1);
+               port_private = calloc (sizeof (*ethernet_private), 1);
+               ethernet_private->port_private = (void *)port_private; 
                if (!port_private) {
                        printf ("%s: %s allocation failure, %s\n",
                                __FUNCTION__, dev->name,