diff options
| author | Jon Mason <jdmason@kudzu.us> | 2011-06-27 14:56:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-28 06:38:45 +0200 |
| commit | 708ebb3a51489e70bc2b67b2772deea336eba849 (patch) | |
| tree | c828b1e143ad95e0c5c8c83bedae9225db34dd01 /drivers/net/tg3.h | |
| parent | net: sh_eth: tidyup compile warning (diff) | |
| download | linux-708ebb3a51489e70bc2b67b2772deea336eba849.tar.xz linux-708ebb3a51489e70bc2b67b2772deea336eba849.zip | |
tg3: remove unnecessary read of PCI_CAP_ID_EXP
The PCIE capability offset is saved during PCI bus walking. Use the
value from pci_dev instead of checking in the driver and saving it off
the the driver specific structure. It will remove an unnecessary search
in the PCI configuration space if this value is referenced instead of
reacquiring it.
v2 of the patch re-adds the PCI_EXPRESS flag and adds comments
describing why it is necessary.
[ pdev->pcie_cap --> pci_pcie_cap(pdev) -DaveM ]
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index bedc3b4557b5..5f250aef7c92 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2857,7 +2857,7 @@ enum TG3_FLAGS { TG3_FLAG_IS_5788, TG3_FLAG_MAX_RXPEND_64, TG3_FLAG_TSO_CAPABLE, - TG3_FLAG_PCI_EXPRESS, + TG3_FLAG_PCI_EXPRESS, /* BCM5785 + pci_is_pcie() */ TG3_FLAG_ASF_NEW_HANDSHAKE, TG3_FLAG_HW_AUTONEG, TG3_FLAG_IS_NIC, @@ -3022,10 +3022,7 @@ struct tg3 { int pm_cap; int msi_cap; - union { int pcix_cap; - int pcie_cap; - }; int pcie_readrq; struct mii_bus *mdio_bus; |