Commit bf88f7d9 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Tony Nguyen

e1000e: Use pcie_capability_read_word() for reading LNKSTA

Use pcie_capability_read_word() for reading LNKSTA and remove the
custom define that matches to PCI_EXP_LNKSTA.

As only single user for cap_offset remains, replace it with a call to
pci_pcie_cap(). Instead of e1000_adapter, make local variable out of
pci_dev because both users are interested in it.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4c39e768
...@@ -678,7 +678,6 @@ ...@@ -678,7 +678,6 @@
/* PCI/PCI-X/PCI-EX Config space */ /* PCI/PCI-X/PCI-EX Config space */
#define PCI_HEADER_TYPE_REGISTER 0x0E #define PCI_HEADER_TYPE_REGISTER 0x0E
#define PCIE_LINK_STATUS 0x12
#define PCI_HEADER_TYPE_MULTIFUNC 0x80 #define PCI_HEADER_TYPE_MULTIFUNC 0x80
......
...@@ -15,18 +15,15 @@ ...@@ -15,18 +15,15 @@
**/ **/
s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
{ {
struct pci_dev *pdev = hw->adapter->pdev;
struct e1000_mac_info *mac = &hw->mac; struct e1000_mac_info *mac = &hw->mac;
struct e1000_bus_info *bus = &hw->bus; struct e1000_bus_info *bus = &hw->bus;
struct e1000_adapter *adapter = hw->adapter; u16 pcie_link_status;
u16 pcie_link_status, cap_offset;
cap_offset = adapter->pdev->pcie_cap; if (!pci_pcie_cap(pdev)) {
if (!cap_offset) {
bus->width = e1000_bus_width_unknown; bus->width = e1000_bus_width_unknown;
} else { } else {
pci_read_config_word(adapter->pdev, pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &pcie_link_status);
cap_offset + PCIE_LINK_STATUS,
&pcie_link_status);
bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW,
pcie_link_status); pcie_link_status);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment