arch/blackfin: don't generate random mac in bfin_get_ether_addr()

Changed bfin_get_ether_addr() to return a state and to
set no random mac address if the board don't provide one.

Let the caller of bfin_get_ether_addr() set a random mac
address if the return value is not 0.

v2: don't set random mac in bfin_get_ether_addr()

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index a2d96d31bbf16a0764b066d7d08a2201374c5fd9..a17395727efa29966feb636c88b8e86df0e54883 100644 (file)
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -821,7 +821,7 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        /* the MAC is stored in OTP memory page 0xDF */
        u32 ret;
@@ -834,5 +834,6 @@ void bfin_get_ether_addr(char *addr)
                for (ret = 0; ret < 6; ++ret)
                        addr[ret] = otp_mac_p[5 - ret];
        }
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
index f271310f739d4107241245218aeebaad21dd4308..6eebee4e421765f4bc962ab2c8eae24cc613481a 100644 (file)
--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@ -730,9 +730,8 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index c8d5d2b7c732fd78f2a678d2fd09315d3b1968f7..fad7fea1b0bf4b5dd6bdb0fa8e981f14ed9beae1 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -846,7 +846,7 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        /* the MAC is stored in OTP memory page 0xDF */
        u32 ret;
@@ -859,5 +859,6 @@ void bfin_get_ether_addr(char *addr)
                for (ret = 0; ret < 6; ++ret)
                        addr[ret] = otp_mac_p[5 - ret];
        }
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 7330607856e96061e9badb1ea24b712b1d1d14da..65b7fbd30e161de00be6b61369885f4d4a81fbf3 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -983,9 +983,8 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index db3ecfce8306c08fb3b660be5ff509a4b2fdfc4b..17c6a24cc0764a51d87ac41c6aa9ae660aaf839c 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -870,7 +870,7 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        /* the MAC is stored in OTP memory page 0xDF */
        u32 ret;
@@ -883,5 +883,6 @@ void bfin_get_ether_addr(char *addr)
                for (ret = 0; ret < 6; ++ret)
                        addr[ret] = otp_mac_p[5 - ret];
        }
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index dfdd8e6bac7296d02f09ff6a0b6f19ea4f42caf2..2f9a2bd83ce44fb47d165a7fb8d4f772e2d99ef2 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -1311,7 +1311,7 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        /* the MAC is stored in OTP memory page 0xDF */
        u32 ret;
@@ -1324,5 +1324,6 @@ void bfin_get_ether_addr(char *addr)
                for (ret = 0; ret < 6; ++ret)
                        addr[ret] = otp_mac_p[5 - ret];
        }
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index 360e97fc529363d53193c34decc623d27b31a34e..d192c0ac941c40390e6c3f06421365f2517e6496 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -931,7 +931,7 @@ void native_machine_restart(char *cmd)
                bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        /* the MAC is stored in OTP memory page 0xDF */
        u32 ret;
@@ -945,5 +945,6 @@ void bfin_get_ether_addr(char *addr)
                for (ret = 0; ret < 6; ++ret)
                        addr[ret] = otp_mac_p[5 - ret];
        }
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 0d4a2f61a973a94399a93aeac18ff86935810b1f..27fd2c32ae9ae8d83fc3658716778a86268d0af0 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -813,9 +813,8 @@ void __init native_machine_early_platform_add_devices(void)
                ARRAY_SIZE(cm_bf537e_early_devices));
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index f5536982706c702137fbd4cda636affac68b8eec..3f3abad86ec322e95d9a3a313af5577ec9f53012 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -790,9 +790,8 @@ void __init native_machine_early_platform_add_devices(void)
                ARRAY_SIZE(cm_bf537u_early_devices));
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index 11dadeb33d79af0dd63118bbce90f794b89d3a48..6f77bf708ec0bf4e2da745ce73f1c2b64260c88b 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -399,9 +399,10 @@ arch_initcall(dnp5370_init);
 /*
  * Currently the MAC address is saved in Flash by U-Boot
  */
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
        *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 6fd84709fc68c08c786018f2b4c63590c639d232..e9507feea319d51c2e223189c7956dde90c9336a 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -535,9 +535,8 @@ void __init native_machine_early_platform_add_devices(void)
                ARRAY_SIZE(stamp_early_devices));
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 2221173e489e5294f9c788ea33db0a9e9389e6dd..0b807253f4d619c668a8bd3f0e5317eb90aa8a41 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -2993,9 +2993,10 @@ void native_machine_restart(char *cmd)
  * Currently the MAC address is saved in Flash by U-Boot
  */
 #define FLASH_MAC      0x203f0000
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
        *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
        *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
+       return 0;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 988517671a5dbd91ac12b3fd028dc156eb0a25af..3fb421823857e0ab3a76fbb743c2862834d801f3 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -780,9 +780,8 @@ void __init native_machine_early_platform_add_devices(void)
                ARRAY_SIZE(cm_bf537_early_devices));
 }
 
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
 {
-       random_ether_addr(addr);
-       printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+       return 1;
 }
 EXPORT_SYMBOL(bfin_get_ether_addr);