lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tg3: Reformat NVRAM case statements

Browse Source 
This patch fixes up the NVRAM detection switch statements to conform
to the kernel coding style.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson
2009-08-28 12:29:16 +00:00
committed by David S. Miller
parent 2befdcea96
commit 8590a603e5
1 changed files with 183 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/tg3.c
View File

@@ -10302,8 +10302,7 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp)
nvcfg1 = tr32(NVRAM_CFG1); nvcfg1 = tr32(NVRAM_CFG1);
if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) { if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) {
tp->tg3_flags2 |= TG3_FLG2_FLASH; tp->tg3_flags2 |= TG3_FLG2_FLASH;
} } else {
else {
nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS; nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
tw32(NVRAM_CFG1, nvcfg1); tw32(NVRAM_CFG1, nvcfg1);
} }
@@ -10340,8 +10339,7 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp)
tp->nvram_pagesize = SST_25VF0X0_PAGE_SIZE; tp->nvram_pagesize = SST_25VF0X0_PAGE_SIZE;
break; break;
} }
} } else {
else {
tp->nvram_jedecnum = JEDEC_ATMEL; tp->nvram_jedecnum = JEDEC_ATMEL;
tp->nvram_pagesize = ATMEL_AT45DB0X1B_PAGE_SIZE; tp->nvram_pagesize = ATMEL_AT45DB0X1B_PAGE_SIZE;
tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED; tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
@@ -10399,8 +10397,7 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)
tp->nvram_pagesize = 264; tp->nvram_pagesize = 264;
break; break;
} }
} } else {
else {
/* For eeprom, set pagesize to maximum eeprom size */ /* For eeprom, set pagesize to maximum eeprom size */
tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE; tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE;