Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9862cc5278aabd82230369a142c817e37a42caa3
Commit: 9862cc5278aabd82230369a142c817e37a42caa3
Parent: 137b1529da492baa654c702ecb60bb950eccb98d
Author: Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 15 21:21:20 2007 +0800
Committer: Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Thu Nov 15 21:21:20 2007 +0800
Blackfin arch: change get_bf537_ether_addr() to bfin_get_ether_addr() since
this is not BF537 specific and to better match other Blackfin-specific
conventions
Signed-off-by: Mike Frysinger <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
arch/blackfin/mach-bf527/boards/ezkit.c | 4 ++--
arch/blackfin/mach-bf537/boards/cm_bf537.c | 4 ++--
arch/blackfin/mach-bf537/boards/generic_board.c | 4 ++--
arch/blackfin/mach-bf537/boards/pnav10.c | 4 ++--
arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
drivers/net/bfin_mac.c | 2 +-
drivers/net/bfin_mac.h | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c
b/arch/blackfin/mach-bf527/boards/ezkit.c
index 57407b9..14b39b2 100644
--- 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 97482d9..1c227a2 100644
--- 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 d9e48ba..ec19a87 100644
--- 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 eea2afc..624330c 100644
--- 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 d35f962..90de218 100644
--- 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 084acfd..0b99b55 100644
--- 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 3a107ad..5970ea7 100644
--- 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
