From: Trilok Soni <[EMAIL PROTECTED]>
Signed-off-by: Trilok Soni <[EMAIL PROTECTED]>
---
arch/arm/mach-davinci/i2c-emac.c | 45 +++++++++++++++++--------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/arch/arm/mach-davinci/i2c-emac.c b/arch/arm/mach-davinci/i2c-emac.c
index 8ca0c70..a3398f2 100644
--- a/arch/arm/mach-davinci/i2c-emac.c
+++ b/arch/arm/mach-davinci/i2c-emac.c
@@ -25,28 +25,27 @@ static unsigned char cpmac_eth_string[20] = "deadbeef";
/* This function gets the Ethernet MAC address from EEPROM
* Input buffer to be of atlease 20 bytes in length
*/
-int davinci_get_macaddr (char *ptr)
+int davinci_get_macaddr(char *ptr)
{
#ifndef CONFIG_I2C_DAVINCI
printk(KERN_INFO "DaVinci EMAC: Unable to read MAC from EEPROM, "
"no i2c support in kernel.\n");
#else
char data[2] = { 0x7f, 0 };
- char temp[20];
- int i = 0;
+ char temp[20];
+ int i = 0;
- if (ptr == NULL) {
+ if (ptr == NULL)
return -EFAULT;
- }
/* If already assigned via cmdline, just use it */
if (strncmp(cpmac_eth_string, "deadbeef", 8)) {
- strncpy (ptr, cpmac_eth_string, 20);
+ strncpy(ptr, cpmac_eth_string, 20);
return 0;
}
- davinci_i2c_write (2, data, 0x50);
- davinci_i2c_read (8, temp, 0x50);
+ davinci_i2c_write(2, data, 0x50);
+ davinci_i2c_read(8, temp, 0x50);
/* check whether MAC address is available in ERPROM else try to
* to get it from bootparams for now. From Delta EVM MAC address
@@ -58,8 +57,7 @@ int davinci_get_macaddr (char *ptr)
(temp [3] != 0xFF) |
(temp [4] != 0xFF) |
(temp [5] != 0xFF) |
- (temp [6] != 0xFF) )
- {
+ (temp [6] != 0xFF)) {
ptr[0] = (*(temp+0) & 0xF0) >> 4;
ptr[1] = (*(temp+0) & 0x0F);
ptr[2] = ':';
@@ -70,16 +68,15 @@ int davinci_get_macaddr (char *ptr)
ptr[7] = (*(temp+2) & 0x0F);
ptr[8] = ':';
ptr[9] = (*(temp+3) & 0xF0) >> 4;
- ptr[10]= (*(temp+3) & 0x0F);
- ptr[11]= ':';
- ptr[12]= (*(temp+4) & 0xF0) >> 4;
- ptr[13]= (*(temp+4) & 0x0F);
- ptr[14]= ':';
- ptr[15]= (*(temp+5) & 0xF0) >> 4;
- ptr[16]= (*(temp+5) & 0x0F);
+ ptr[10] = (*(temp+3) & 0x0F);
+ ptr[11] = ':';
+ ptr[12] = (*(temp+4) & 0xF0) >> 4;
+ ptr[13] = (*(temp+4) & 0x0F);
+ ptr[14] = ':';
+ ptr[15] = (*(temp+5) & 0xF0) >> 4;
+ ptr[16] = (*(temp+5) & 0x0F);
- for (i = 0; i < 17; i++)
- {
+ for (i = 0; i < 17; i++) {
if (ptr[i] == ':')
continue;
else if (ptr[i] <= 9)
@@ -90,7 +87,7 @@ int davinci_get_macaddr (char *ptr)
} else
#endif
{
- strncpy (ptr, cpmac_eth_string, 20);
+ strncpy(ptr, cpmac_eth_string, 20);
}
return 0;
}
@@ -99,12 +96,12 @@ EXPORT_SYMBOL(davinci_get_macaddr);
static int davinci_cpmac_eth_setup(char *str)
{
/* The first char passed from the bootloader is '=', so ignore it */
- strcpy(&cpmac_eth_string[0], &str[1]);
+ strcpy(&cpmac_eth_string[0], &str[1]);
- printk("TI DaVinci EMAC: Kernel Boot params Eth address: %s\n",
- cpmac_eth_string);
+ printk("TI DaVinci EMAC: Kernel Boot params Eth address: %s\n",
+ cpmac_eth_string);
- return (1);
+ return 1;
}
__setup("eth", davinci_cpmac_eth_setup);
--
1.5.5
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
