[RFC PATCH 13/14] r8169/PCI: use PCIe cap access functions to simplify implementation

From: Jiang Liu
Date: Tue Jul 10 2012 - 11:56:47 EST


From: Jiang Liu <jiang.liu@xxxxxxxxxx>

Use PCIe cap access functions to simplify r8169 driver implementation

Signed-off-by: Jiang Liu <liuj97@xxxxxxxxx>
Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
---
drivers/net/ethernet/realtek/r8169.c | 38 +++++++++++-----------------------
1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9757ce3..c9a7146 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -807,14 +807,11 @@ static void rtl_unlock_work(struct rtl8169_private *tp)

static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
{
- int cap = pci_pcie_cap(pdev);
+ u16 ctl;

- if (cap) {
- u16 ctl;
-
- pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &ctl);
+ if (!pci_pcie_cap_read_word(pdev, PCI_EXP_DEVCTL, &ctl)) {
ctl = (ctl & ~PCI_EXP_DEVCTL_READRQ) | force;
- pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl);
+ pci_pcie_cap_write_word(pdev, PCI_EXP_DEVCTL, ctl);
}
}

@@ -4504,27 +4501,21 @@ static void rtl_ephy_init(void __iomem *ioaddr, const struct ephy_info *e, int l

static void rtl_disable_clock_request(struct pci_dev *pdev)
{
- int cap = pci_pcie_cap(pdev);
-
- if (cap) {
- u16 ctl;
+ u16 ctl;

- pci_read_config_word(pdev, cap + PCI_EXP_LNKCTL, &ctl);
+ if (!pci_pcie_cap_read_word(pdev, PCI_EXP_LNKCTL, &ctl)) {
ctl &= ~PCI_EXP_LNKCTL_CLKREQ_EN;
- pci_write_config_word(pdev, cap + PCI_EXP_LNKCTL, ctl);
+ pci_pcie_cap_write_word(pdev, PCI_EXP_LNKCTL, ctl);
}
}

static void rtl_enable_clock_request(struct pci_dev *pdev)
{
- int cap = pci_pcie_cap(pdev);
-
- if (cap) {
- u16 ctl;
+ u16 ctl;

- pci_read_config_word(pdev, cap + PCI_EXP_LNKCTL, &ctl);
+ if (!pci_pcie_cap_read_word(pdev, PCI_EXP_LNKCTL, &ctl)) {
ctl |= PCI_EXP_LNKCTL_CLKREQ_EN;
- pci_write_config_word(pdev, cap + PCI_EXP_LNKCTL, ctl);
+ pci_pcie_cap_write_word(pdev, PCI_EXP_LNKCTL, ctl);
}
}

@@ -5132,14 +5123,9 @@ static void rtl_hw_start_8101(struct net_device *dev)
tp->event_slow &= ~RxFIFOOver;

if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||
- tp->mac_version == RTL_GIGA_MAC_VER_16) {
- int cap = pci_pcie_cap(pdev);
-
- if (cap) {
- pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL,
- PCI_EXP_DEVCTL_NOSNOOP_EN);
- }
- }
+ tp->mac_version == RTL_GIGA_MAC_VER_16)
+ pci_pcie_cap_write_word(pdev, PCI_EXP_DEVCTL,
+ PCI_EXP_DEVCTL_NOSNOOP_EN);

RTL_W8(Cfg9346, Cfg9346_Unlock);

--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/