Blackfin arch: change get_bf537_ether_addr() to bfin_get_ether_addr() since this...

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 57407b95d532b6c2c83b68d8283fdccaa9b17b07..14b39b23833b1999fe91de38f7286fc51c8d8b1d 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -813,9 +813,9 @@ void native_machine_restart(char *cmd)
  * Currently the MAC address is saved in Flash by U-Boot
  */
 #define FLASH_MAC      0x203f0000
-void get_bf537_ether_addr(char *addr)
+void bfin_get_ether_addr(char *addr)
 {
        *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
        *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
 }
-EXPORT_SYMBOL(get_bf537_ether_addr);
+EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 97482d9b41771b4b38d9a3c65346bd639a4e6fc6..1c227a231464d394e540cc5e937a29b12aafc190 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -428,9 +428,9 @@ static int __init cm_bf537_init(void)
 
 arch_initcall(cm_bf537_init);
 
-void get_bf537_ether_addr(char *addr)
+void 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__);
 }
-EXPORT_SYMBOL(get_bf537_ether_addr);
+EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index d9e48ba23de1e51bbff82d1a92d105b54a789b30..ec19a871da81d2cf88a2b563d8c4e3ec399ecde1 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -733,9 +733,9 @@ void native_machine_restart(char *cmd)
                bfin_gpio_reset_spi0_ssel1();
 }
 
-void get_bf537_ether_addr(char *addr)
+void 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__);
 }
-EXPORT_SYMBOL(get_bf537_ether_addr);
+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 eea2afc72b57eccc314c51400ad1f2d99e60ccd9..624330cc7a6df416782a8cf044a387d633af921f 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -511,9 +511,9 @@ static int __init stamp_init(void)
 
 arch_initcall(stamp_init);
 
-void get_bf537_ether_addr(char *addr)
+void 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__);
 }
-EXPORT_SYMBOL(get_bf537_ether_addr);
+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 d35f9628972c4e7830a1163f5d3427c552849f3f..90de2182c8d62d20d49d50429ebace1f80324b56 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -737,9 +737,9 @@ void native_machine_restart(char *cmd)
  * Currently the MAC address is saved in Flash by U-Boot
  */
 #define FLASH_MAC      0x203f0000
-void get_bf537_ether_addr(char *addr)
+void bfin_get_ether_addr(char *addr)
 {
        *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
        *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
 }
-EXPORT_SYMBOL(get_bf537_ether_addr);
+EXPORT_SYMBOL(bfin_get_ether_addr);

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 084acfd6fc5fdaeba614a7e20302c89f3842546f..0b99b554929545cecf0abf93812873d7306518d4 100644 (file)
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev)
        if (!is_valid_ether_addr(dev->dev_addr)) {
                /* Grab the MAC from the board somehow - this is done in the
                   arch/blackfin/mach-bf537/boards/eth_mac.c */
-               get_bf537_ether_addr(dev->dev_addr);
+               bfin_get_ether_addr(dev->dev_addr);
        }
 
        /* If still not valid, get a random one */

diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 3a107ad75381ecd7ac18305952b0194f8f8844c0..5970ea7142cd53c3e5f1d4234110a484f8af0191 100644 (file)
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -92,4 +92,4 @@ struct bf537mac_local {
        struct mii_bus mii_bus;
 };
 
-extern void get_bf537_ether_addr(char *addr);
+extern void bfin_get_ether_addr(char *addr);