Commit 8590a603 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Reformat NVRAM case statements 



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

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2befdcea

drivers/net/tg3.c

+183 −186
Original line number Diff line number Diff line
@@ -10302,8 +10302,7 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp) 
	nvcfg1 = tr32(NVRAM_CFG1);

	if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) {

		tp->tg3_flags2 |= TG3_FLG2_FLASH;

	}

	else {

	} else {

		nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;

		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;

			break;

		}

	}

	else {

	} else {

		tp->nvram_jedecnum = JEDEC_ATMEL;

		tp->nvram_pagesize = ATMEL_AT45DB0X1B_PAGE_SIZE;

		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;

			break;

		}

	}

	else {

	} else {

		/* For eeprom, set pagesize to maximum eeprom size */

		tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE;