Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

e1000e: Cleanup to fix checkpatch missing blank lines

Fixing "WARNING:SPACING: networking uses a blank line after declarations"

Signed-off-by: Dave Ertman <davidx.m.ertman@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

David Ertman and committed by
Jeff Kirsher
6cf08d1c 3992c8ed

+23
+3
drivers/net/ethernet/intel/e1000e/ethtool.c
··· 169 169 } 170 170 } else if (!pm_runtime_suspended(netdev->dev.parent)) { 171 171 u32 status = er32(STATUS); 172 + 172 173 if (status & E1000_STATUS_LU) { 173 174 if (status & E1000_STATUS_SPEED_1000) 174 175 speed = SPEED_1000; ··· 794 793 int reg, u32 mask, u32 write) 795 794 { 796 795 u32 val; 796 + 797 797 __ew32(&adapter->hw, reg, write & mask); 798 798 val = __er32(&adapter->hw, reg); 799 799 if ((write & mask) != (val & mask)) { ··· 1719 1717 *data = 0; 1720 1718 if (hw->phy.media_type == e1000_media_type_internal_serdes) { 1721 1719 int i = 0; 1720 + 1722 1721 hw->mac.serdes_has_link = false; 1723 1722 1724 1723 /* On some blade server designs, link establishment
+1
drivers/net/ethernet/intel/e1000e/ich8lan.c
··· 1320 1320 */ 1321 1321 if ((hw->mac.type == e1000_pch2lan) && link) { 1322 1322 u32 reg; 1323 + 1323 1324 reg = er32(STATUS); 1324 1325 if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) { 1325 1326 reg = er32(TIPG);
+13
drivers/net/ethernet/intel/e1000e/netdev.c
··· 599 599 600 600 if (unlikely(!ret_val && (i != readl(rx_ring->tail)))) { 601 601 u32 rctl = er32(RCTL); 602 + 602 603 ew32(RCTL, rctl & ~E1000_RCTL_EN); 603 604 e_err("ME firmware caused invalid RDT - resetting\n"); 604 605 schedule_work(&adapter->reset_task); ··· 616 615 617 616 if (unlikely(!ret_val && (i != readl(tx_ring->tail)))) { 618 617 u32 tctl = er32(TCTL); 618 + 619 619 ew32(TCTL, tctl & ~E1000_TCTL_EN); 620 620 e_err("ME firmware caused invalid TDT - resetting\n"); 621 621 schedule_work(&adapter->reset_task); ··· 1200 1198 while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) && 1201 1199 (count < tx_ring->count)) { 1202 1200 bool cleaned = false; 1201 + 1203 1202 rmb(); /* read buffer_info after eop_desc */ 1204 1203 for (; !cleaned; count++) { 1205 1204 tx_desc = E1000_TX_DESC(*tx_ring, i); ··· 1756 1753 adapter->flags & FLAG_RX_NEEDS_RESTART) { 1757 1754 /* disable receives */ 1758 1755 u32 rctl = er32(RCTL); 1756 + 1759 1757 ew32(RCTL, rctl & ~E1000_RCTL_EN); 1760 1758 adapter->flags |= FLAG_RESTART_NOW; 1761 1759 } ··· 1964 1960 /* Workaround issue with spurious interrupts on 82574 in MSI-X mode */ 1965 1961 if (hw->mac.type == e1000_82574) { 1966 1962 u32 rfctl = er32(RFCTL); 1963 + 1967 1964 rfctl |= E1000_RFCTL_ACK_DIS; 1968 1965 ew32(RFCTL, rfctl); 1969 1966 } ··· 2209 2204 2210 2205 if (adapter->msix_entries) { 2211 2206 int i; 2207 + 2212 2208 for (i = 0; i < adapter->num_vectors; i++) 2213 2209 synchronize_irq(adapter->msix_entries[i].vector); 2214 2210 } else { ··· 2927 2921 2928 2922 if (adapter->flags2 & FLAG2_DMA_BURST) { 2929 2923 u32 txdctl = er32(TXDCTL(0)); 2924 + 2930 2925 txdctl &= ~(E1000_TXDCTL_PTHRESH | E1000_TXDCTL_HTHRESH | 2931 2926 E1000_TXDCTL_WTHRESH); 2932 2927 /* set up some performance related parameters to encourage the ··· 3246 3239 3247 3240 if (adapter->flags & FLAG_IS_ICH) { 3248 3241 u32 rxdctl = er32(RXDCTL(0)); 3242 + 3249 3243 ew32(RXDCTL(0), rxdctl | 0x3); 3250 3244 } 3251 3245 ··· 4703 4695 /* Correctable ECC Errors */ 4704 4696 if (hw->mac.type == e1000_pch_lpt) { 4705 4697 u32 pbeccsts = er32(PBECCSTS); 4698 + 4706 4699 adapter->corr_errors += 4707 4700 pbeccsts & E1000_PBECCSTS_CORR_ERR_CNT_MASK; 4708 4701 adapter->uncorr_errors += ··· 4817 4808 (adapter->flags & FLAG_RESTART_NOW)) { 4818 4809 struct e1000_hw *hw = &adapter->hw; 4819 4810 u32 rctl = er32(RCTL); 4811 + 4820 4812 ew32(RCTL, rctl | E1000_RCTL_EN); 4821 4813 adapter->flags &= ~FLAG_RESTART_NOW; 4822 4814 } ··· 4940 4930 if ((adapter->flags & FLAG_TARC_SPEED_MODE_BIT) && 4941 4931 !txb2b) { 4942 4932 u32 tarc0; 4933 + 4943 4934 tarc0 = er32(TARC(0)); 4944 4935 tarc0 &= ~SPEED_MODE_BIT; 4945 4936 ew32(TARC(0), tarc0); ··· 6220 6209 e1e_wphy(&adapter->hw, BM_WUS, ~0); 6221 6210 } else { 6222 6211 u32 wus = er32(WUS); 6212 + 6223 6213 if (wus) { 6224 6214 e_info("MAC Wakeup cause - %s\n", 6225 6215 wus & E1000_WUS_EX ? "Unicast Packet" : ··· 7156 7144 static int __init e1000_init_module(void) 7157 7145 { 7158 7146 int ret; 7147 + 7159 7148 pr_info("Intel(R) PRO/1000 Network Driver - %s\n", 7160 7149 e1000e_driver_version); 7161 7150 pr_info("Copyright(c) 1999 - 2014 Intel Corporation.\n");
+1
drivers/net/ethernet/intel/e1000e/nvm.c
··· 398 398 /* Loop to allow for up to whole page write of eeprom */ 399 399 while (widx < words) { 400 400 u16 word_out = data[widx]; 401 + 401 402 word_out = (word_out >> 8) | (word_out << 8); 402 403 e1000_shift_out_eec_bits(hw, word_out, 16); 403 404 widx++;
+4
drivers/net/ethernet/intel/e1000e/param.c
··· 436 436 437 437 if (num_IntMode > bd) { 438 438 unsigned int int_mode = IntMode[bd]; 439 + 439 440 e1000_validate_option(&int_mode, &opt, adapter); 440 441 adapter->int_mode = int_mode; 441 442 } else { ··· 458 457 459 458 if (num_SmartPowerDownEnable > bd) { 460 459 unsigned int spd = SmartPowerDownEnable[bd]; 460 + 461 461 e1000_validate_option(&spd, &opt, adapter); 462 462 if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) && spd) 463 463 adapter->flags |= FLAG_SMART_POWER_DOWN; ··· 475 473 476 474 if (num_CrcStripping > bd) { 477 475 unsigned int crc_stripping = CrcStripping[bd]; 476 + 478 477 e1000_validate_option(&crc_stripping, &opt, adapter); 479 478 if (crc_stripping == OPTION_ENABLED) { 480 479 adapter->flags2 |= FLAG2_CRC_STRIPPING; ··· 498 495 499 496 if (num_KumeranLockLoss > bd) { 500 497 unsigned int kmrn_lock_loss = KumeranLockLoss[bd]; 498 + 501 499 e1000_validate_option(&kmrn_lock_loss, &opt, adapter); 502 500 enabled = kmrn_lock_loss; 503 501 }
+1
drivers/net/ethernet/intel/e1000e/phy.c
··· 2896 2896 (hw->phy.addr == 2) && 2897 2897 !(MAX_PHY_REG_ADDRESS & reg) && (data & (1 << 11))) { 2898 2898 u16 data2 = 0x7EFF; 2899 + 2899 2900 ret_val = e1000_access_phy_debug_regs_hv(hw, 2900 2901 (1 << 6) | 0x3, 2901 2902 &data2, false);