sh: sh_eth: Remove garbage from printf

[karo-tx-uboot.git] / drivers / net / tigon3.c

diff --git a/drivers/net/tigon3.c b/drivers/net/tigon3.c
index 5f6a4ecd0abe84de297b9ba0bfdbdc66c2bf2a0a..33cb447b1ec1f9e1b72f11d8a3d7928d9ad370f4 100644 (file)
--- a/drivers/net/tigon3.c
+++ b/drivers/net/tigon3.c
@@ -12,8 +12,7 @@
 /******************************************************************************/
 #include <common.h>
 #include <asm/types.h>
-#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_TIGON3)
+
 #ifdef CONFIG_BMW
 #include <mpc824x.h>
 #endif
@@ -2248,7 +2247,7 @@ LM_STATUS LM_ResetAdapter (PLM_DEVICE_BLOCK pDevice)
        REG_WR (pDevice, Grc.Mode, Value32);
 
        /* Setup the timer prescalar register. */
-       REG_WR (pDevice, Grc.MiscCfg, 65 << 1); /* Clock is alwasy 66Mhz. */
+       REG_WR (pDevice, Grc.MiscCfg, 65 << 1); /* Clock is alwasy 66MHz. */
 
        /* Set up the MBUF pool base address and size. */
        REG_WR (pDevice, BufMgr.MbufPoolAddr, pDevice->MbufBase);
@@ -2464,7 +2463,7 @@ LM_STATUS LM_ResetAdapter (PLM_DEVICE_BLOCK pDevice)
 #endif                         /* T3_JUMBO_RCV_ENTRY_COUNT */
 
        /* Configure the MAC address. */
-       LM_SetMacAddress (pDevice, pDevice->NodeAddress);
+       LM_SetMacAddress (pDevice);
 
        /* Initialize the transmit random backoff seed. */
        Value32 = (pDevice->NodeAddress[0] + pDevice->NodeAddress[1] +
@@ -3429,7 +3428,7 @@ LM_STATUS LM_Halt (PLM_DEVICE_BLOCK pDevice)
                     (pDevice->SubsystemId << 16) | pDevice->SubsystemVendorId);
 
        /* Reprogram the MAC address. */
-       LM_SetMacAddress (pDevice, pDevice->NodeAddress);
+       LM_SetMacAddress (pDevice);
 
        return LM_STATUS_SUCCESS;
 }                              /* LM_Halt */
@@ -3834,9 +3833,10 @@ LM_STATUS LM_MulticastClear (PLM_DEVICE_BLOCK pDevice)
 /*                                                                            */
 /* Return:                                                                    */
 /******************************************************************************/
-LM_STATUS LM_SetMacAddress (PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pMacAddress)
+LM_STATUS LM_SetMacAddress (PLM_DEVICE_BLOCK pDevice)
 {
        LM_UINT32 j;
+       PLM_UINT8 pMacAddress = pDevice->NodeAddress;
 
        for (j = 0; j < 4; j++) {
                REG_WR (pDevice, MacCtrl.MacAddr[j].High,
@@ -5695,5 +5695,3 @@ LM_DmaTest (PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
        }
        return LM_STATUS_SUCCESS;
 }
-
-#endif