You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] e1000: Fix whitespace
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Jesse Brandeburg
committed by
Jeff Garzik
Jeff Garzik
parent
6150f03815
commit
96838a40f0
+153
-154
File diff suppressed because it is too large
Load Diff
@@ -1600,10 +1600,10 @@ e1000_phy_setup_autoneg(struct e1000_hw *hw)
|
||||
if(ret_val)
|
||||
return ret_val;
|
||||
|
||||
/* Read the MII 1000Base-T Control Register (Address 9). */
|
||||
ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg);
|
||||
if(ret_val)
|
||||
return ret_val;
|
||||
/* Read the MII 1000Base-T Control Register (Address 9). */
|
||||
ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg);
|
||||
if(ret_val)
|
||||
return ret_val;
|
||||
|
||||
/* Need to parse both autoneg_advertised and fc and set up
|
||||
* the appropriate PHY registers. First we will parse for
|
||||
@@ -3916,7 +3916,7 @@ e1000_read_eeprom(struct e1000_hw *hw,
|
||||
}
|
||||
}
|
||||
|
||||
if(eeprom->use_eerd == TRUE) {
|
||||
if (eeprom->use_eerd == TRUE) {
|
||||
ret_val = e1000_read_eeprom_eerd(hw, offset, words, data);
|
||||
if ((e1000_is_onboard_nvm_eeprom(hw) == TRUE) ||
|
||||
(hw->mac_type != e1000_82573))
|
||||
@@ -4423,7 +4423,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
|
||||
return -E1000_ERR_EEPROM;
|
||||
}
|
||||
|
||||
/* If STM opcode located in bits 15:8 of flop, reset firmware */
|
||||
/* If STM opcode located in bits 15:8 of flop, reset firmware */
|
||||
if ((flop & 0xFF00) == E1000_STM_OPCODE) {
|
||||
E1000_WRITE_REG(hw, HICR, E1000_HICR_FW_RESET);
|
||||
}
|
||||
@@ -4431,7 +4431,7 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
|
||||
/* Perform the flash update */
|
||||
E1000_WRITE_REG(hw, EECD, eecd | E1000_EECD_FLUPD);
|
||||
|
||||
for (i=0; i < attempts; i++) {
|
||||
for (i=0; i < attempts; i++) {
|
||||
eecd = E1000_READ_REG(hw, EECD);
|
||||
if ((eecd & E1000_EECD_FLUPD) == 0) {
|
||||
break;
|
||||
@@ -4504,6 +4504,7 @@ e1000_read_mac_addr(struct e1000_hw * hw)
|
||||
hw->perm_mac_addr[i] = (uint8_t) (eeprom_data & 0x00FF);
|
||||
hw->perm_mac_addr[i+1] = (uint8_t) (eeprom_data >> 8);
|
||||
}
|
||||
|
||||
switch (hw->mac_type) {
|
||||
default:
|
||||
break;
|
||||
@@ -6840,7 +6841,8 @@ int32_t
|
||||
e1000_check_phy_reset_block(struct e1000_hw *hw)
|
||||
{
|
||||
uint32_t manc = 0;
|
||||
if(hw->mac_type > e1000_82547_rev_2)
|
||||
|
||||
if (hw->mac_type > e1000_82547_rev_2)
|
||||
manc = E1000_READ_REG(hw, MANC);
|
||||
return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
|
||||
E1000_BLK_PHY_RESET : E1000_SUCCESS;
|
||||
|
||||
@@ -902,14 +902,14 @@ struct e1000_ffvt_entry {
|
||||
#define E1000_TXDCTL 0x03828 /* TX Descriptor Control - RW */
|
||||
#define E1000_TADV 0x0382C /* TX Interrupt Absolute Delay Val - RW */
|
||||
#define E1000_TSPMT 0x03830 /* TCP Segmentation PAD & Min Threshold - RW */
|
||||
#define E1000_TARC0 0x03840 /* TX Arbitration Count (0) */
|
||||
#define E1000_TDBAL1 0x03900 /* TX Desc Base Address Low (1) - RW */
|
||||
#define E1000_TDBAH1 0x03904 /* TX Desc Base Address High (1) - RW */
|
||||
#define E1000_TDLEN1 0x03908 /* TX Desc Length (1) - RW */
|
||||
#define E1000_TDH1 0x03910 /* TX Desc Head (1) - RW */
|
||||
#define E1000_TDT1 0x03918 /* TX Desc Tail (1) - RW */
|
||||
#define E1000_TXDCTL1 0x03928 /* TX Descriptor Control (1) - RW */
|
||||
#define E1000_TARC1 0x03940 /* TX Arbitration Count (1) */
|
||||
#define E1000_TARC0 0x03840 /* TX Arbitration Count (0) */
|
||||
#define E1000_TDBAL1 0x03900 /* TX Desc Base Address Low (1) - RW */
|
||||
#define E1000_TDBAH1 0x03904 /* TX Desc Base Address High (1) - RW */
|
||||
#define E1000_TDLEN1 0x03908 /* TX Desc Length (1) - RW */
|
||||
#define E1000_TDH1 0x03910 /* TX Desc Head (1) - RW */
|
||||
#define E1000_TDT1 0x03918 /* TX Desc Tail (1) - RW */
|
||||
#define E1000_TXDCTL1 0x03928 /* TX Descriptor Control (1) - RW */
|
||||
#define E1000_TARC1 0x03940 /* TX Arbitration Count (1) */
|
||||
#define E1000_CRCERRS 0x04000 /* CRC Error Count - R/clr */
|
||||
#define E1000_ALGNERRC 0x04004 /* Alignment Error Count - R/clr */
|
||||
#define E1000_SYMERRS 0x04008 /* Symbol Error Count - R/clr */
|
||||
@@ -1764,7 +1764,6 @@ struct e1000_hw {
|
||||
#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
|
||||
#define E1000_TXDCTL_COUNT_DESC 0x00400000 /* Enable the counting of desc.
|
||||
still to be processed. */
|
||||
|
||||
/* Transmit Configuration Word */
|
||||
#define E1000_TXCW_FD 0x00000020 /* TXCW full duplex */
|
||||
#define E1000_TXCW_HD 0x00000040 /* TXCW half duplex */
|
||||
|
||||
+249
-247
File diff suppressed because it is too large
Load Diff
@@ -47,7 +47,7 @@
|
||||
BUG(); \
|
||||
} else { \
|
||||
msleep(x); \
|
||||
} } while(0)
|
||||
} } while (0)
|
||||
|
||||
/* Some workarounds require millisecond delays and are run during interrupt
|
||||
* context. Most notably, when establishing link, the phy may need tweaking
|
||||
|
||||
@@ -227,7 +227,7 @@ static int __devinit
|
||||
e1000_validate_option(int *value, struct e1000_option *opt,
|
||||
struct e1000_adapter *adapter)
|
||||
{
|
||||
if(*value == OPTION_UNSET) {
|
||||
if (*value == OPTION_UNSET) {
|
||||
*value = opt->def;
|
||||
return 0;
|
||||
}
|
||||
@@ -244,7 +244,7 @@ e1000_validate_option(int *value, struct e1000_option *opt,
|
||||
}
|
||||
break;
|
||||
case range_option:
|
||||
if(*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
|
||||
if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
|
||||
DPRINTK(PROBE, INFO,
|
||||
"%s set to %i\n", opt->name, *value);
|
||||
return 0;
|
||||
@@ -254,10 +254,10 @@ e1000_validate_option(int *value, struct e1000_option *opt,
|
||||
int i;
|
||||
struct e1000_opt_list *ent;
|
||||
|
||||
for(i = 0; i < opt->arg.l.nr; i++) {
|
||||
for (i = 0; i < opt->arg.l.nr; i++) {
|
||||
ent = &opt->arg.l.p[i];
|
||||
if(*value == ent->i) {
|
||||
if(ent->str[0] != '\0')
|
||||
if (*value == ent->i) {
|
||||
if (ent->str[0] != '\0')
|
||||
DPRINTK(PROBE, INFO, "%s\n", ent->str);
|
||||
return 0;
|
||||
}
|
||||
@@ -291,7 +291,7 @@ void __devinit
|
||||
e1000_check_options(struct e1000_adapter *adapter)
|
||||
{
|
||||
int bd = adapter->bd_number;
|
||||
if(bd >= E1000_MAX_NIC) {
|
||||
if (bd >= E1000_MAX_NIC) {
|
||||
DPRINTK(PROBE, NOTICE,
|
||||
"Warning: no configuration for board #%i\n", bd);
|
||||
DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
|
||||
@@ -315,7 +315,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
if (num_TxDescriptors > bd) {
|
||||
tx_ring->count = TxDescriptors[bd];
|
||||
e1000_validate_option(&tx_ring->count, &opt, adapter);
|
||||
E1000_ROUNDUP(tx_ring->count,
|
||||
E1000_ROUNDUP(tx_ring->count,
|
||||
REQ_TX_DESCRIPTOR_MULTIPLE);
|
||||
} else {
|
||||
tx_ring->count = opt.def;
|
||||
@@ -341,7 +341,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
if (num_RxDescriptors > bd) {
|
||||
rx_ring->count = RxDescriptors[bd];
|
||||
e1000_validate_option(&rx_ring->count, &opt, adapter);
|
||||
E1000_ROUNDUP(rx_ring->count,
|
||||
E1000_ROUNDUP(rx_ring->count,
|
||||
REQ_RX_DESCRIPTOR_MULTIPLE);
|
||||
} else {
|
||||
rx_ring->count = opt.def;
|
||||
@@ -403,7 +403,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
|
||||
if (num_TxIntDelay > bd) {
|
||||
adapter->tx_int_delay = TxIntDelay[bd];
|
||||
e1000_validate_option(&adapter->tx_int_delay, &opt,
|
||||
e1000_validate_option(&adapter->tx_int_delay, &opt,
|
||||
adapter);
|
||||
} else {
|
||||
adapter->tx_int_delay = opt.def;
|
||||
@@ -421,7 +421,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
|
||||
if (num_TxAbsIntDelay > bd) {
|
||||
adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
|
||||
e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
|
||||
e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
|
||||
adapter);
|
||||
} else {
|
||||
adapter->tx_abs_int_delay = opt.def;
|
||||
@@ -439,7 +439,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
|
||||
if (num_RxIntDelay > bd) {
|
||||
adapter->rx_int_delay = RxIntDelay[bd];
|
||||
e1000_validate_option(&adapter->rx_int_delay, &opt,
|
||||
e1000_validate_option(&adapter->rx_int_delay, &opt,
|
||||
adapter);
|
||||
} else {
|
||||
adapter->rx_int_delay = opt.def;
|
||||
@@ -457,7 +457,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
|
||||
if (num_RxAbsIntDelay > bd) {
|
||||
adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
|
||||
e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
|
||||
e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
|
||||
adapter);
|
||||
} else {
|
||||
adapter->rx_abs_int_delay = opt.def;
|
||||
@@ -475,17 +475,17 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
|
||||
if (num_InterruptThrottleRate > bd) {
|
||||
adapter->itr = InterruptThrottleRate[bd];
|
||||
switch(adapter->itr) {
|
||||
switch (adapter->itr) {
|
||||
case 0:
|
||||
DPRINTK(PROBE, INFO, "%s turned off\n",
|
||||
DPRINTK(PROBE, INFO, "%s turned off\n",
|
||||
opt.name);
|
||||
break;
|
||||
case 1:
|
||||
DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
|
||||
DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
|
||||
opt.name);
|
||||
break;
|
||||
default:
|
||||
e1000_validate_option(&adapter->itr, &opt,
|
||||
e1000_validate_option(&adapter->itr, &opt,
|
||||
adapter);
|
||||
break;
|
||||
}
|
||||
@@ -494,7 +494,7 @@ e1000_check_options(struct e1000_adapter *adapter)
|
||||
}
|
||||
}
|
||||
|
||||
switch(adapter->hw.media_type) {
|
||||
switch (adapter->hw.media_type) {
|
||||
case e1000_media_type_fiber:
|
||||
case e1000_media_type_internal_serdes:
|
||||
e1000_check_fiber_options(adapter);
|
||||
@@ -518,17 +518,17 @@ static void __devinit
|
||||
e1000_check_fiber_options(struct e1000_adapter *adapter)
|
||||
{
|
||||
int bd = adapter->bd_number;
|
||||
if(num_Speed > bd) {
|
||||
if (num_Speed > bd) {
|
||||
DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
|
||||
"parameter ignored\n");
|
||||
}
|
||||
|
||||
if(num_Duplex > bd) {
|
||||
if (num_Duplex > bd) {
|
||||
DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
|
||||
"parameter ignored\n");
|
||||
}
|
||||
|
||||
if((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
|
||||
if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
|
||||
DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
|
||||
"not valid for fiber adapters, "
|
||||
"parameter ignored\n");
|
||||
@@ -598,7 +598,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
|
||||
}
|
||||
}
|
||||
|
||||
if((num_AutoNeg > bd) && (speed != 0 || dplx != 0)) {
|
||||
if ((num_AutoNeg > bd) && (speed != 0 || dplx != 0)) {
|
||||
DPRINTK(PROBE, INFO,
|
||||
"AutoNeg specified along with Speed or Duplex, "
|
||||
"parameter ignored\n");
|
||||
@@ -659,7 +659,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
|
||||
switch (speed + dplx) {
|
||||
case 0:
|
||||
adapter->hw.autoneg = adapter->fc_autoneg = 1;
|
||||
if((num_Speed > bd) && (speed != 0 || dplx != 0))
|
||||
if ((num_Speed > bd) && (speed != 0 || dplx != 0))
|
||||
DPRINTK(PROBE, INFO,
|
||||
"Speed and duplex autonegotiation enabled\n");
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user