summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-11-22 11:22:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-11-24 10:06:14 +0100
commit162ee2c8c9fc2cfd7351505be4d595e620f9ec28 (patch)
treece8ac7ab06790550e12841c90e355cb75a645a1c /drivers/net/e1000
parent89ad75d8a64394a9ffd873c9b717f6a007c4617e (diff)
downloadbarebox-162ee2c8c9fc2cfd7351505be4d595e620f9ec28.tar.gz
barebox-162ee2c8c9fc2cfd7351505be4d595e620f9ec28.tar.xz
net/e1000: fix coding style at a few locations
While working on the e1000 driver I noticed a few coding style misdeeds. These are fixed here. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/eeprom.c15
-rw-r--r--drivers/net/e1000/main.c4
2 files changed, 14 insertions, 5 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 2a71fb1b15..150e4147c4 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -366,7 +366,8 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
case e1000_82543:
case e1000_82544:
e1000_eeprom_uses_microwire(eeprom, 0);
- break;
+ break;
+
case e1000_82540:
case e1000_82545:
case e1000_82545_rev_3:
@@ -374,6 +375,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
case e1000_82546_rev_3:
e1000_eeprom_uses_microwire(eeprom, eecd);
break;
+
case e1000_82541:
case e1000_82541_rev_2:
case e1000_82547:
@@ -383,10 +385,12 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
else
e1000_eeprom_uses_microwire(eeprom, eecd);
break;
+
case e1000_82571:
case e1000_82572:
e1000_eeprom_uses_spi(eeprom, eecd);
break;
+
case e1000_82573:
case e1000_82574:
if (e1000_is_onboard_nvm_eeprom(hw)) {
@@ -396,16 +400,20 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_flash;
eeprom->word_size = 2048;
- /* Ensure that the Autonomous FLASH update bit is cleared due to
- * Flash update issue on parts which use a FLASH for NVM. */
+ /*
+ * Ensure that the Autonomous FLASH update bit is cleared due to
+ * Flash update issue on parts which use a FLASH for NVM.
+ */
eecd &= ~E1000_EECD_AUPDEN;
e1000_write_reg(hw, E1000_EECD, eecd);
}
break;
+
case e1000_80003es2lan:
eeprom->type = e1000_eeprom_spi;
eeprom->read = e1000_read_eeprom_eerd;
break;
+
case e1000_igb:
if (eecd & E1000_EECD_I210_FLASH_DETECTED) {
uint32_t fla;
@@ -431,6 +439,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->read = e1000_read_eeprom_eerd;
break;
+
default:
break;
}
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 00d18adff1..6491623104 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -142,8 +142,8 @@ static int32_t e1000_set_phy_mode(struct e1000_hw *hw)
***************************************************************************/
static int32_t e1000_get_software_semaphore(struct e1000_hw *hw)
{
- int32_t timeout = hw->eeprom.word_size + 1;
- uint32_t swsm;
+ int32_t timeout = hw->eeprom.word_size + 1;
+ uint32_t swsm;
DEBUGFUNC();