From patchwork Tue Jul 10 15:54:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1178111 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 607E8DFF34 for ; Tue, 10 Jul 2012 15:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756120Ab2GJP4w (ORCPT ); Tue, 10 Jul 2012 11:56:52 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43454 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753118Ab2GJP4u (ORCPT ); Tue, 10 Jul 2012 11:56:50 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so456687pbb.19 for ; Tue, 10 Jul 2012 08:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=3L559+j6xyts0HNm6747tYDlvIw3NBh/A4iWWGXKt0g=; b=pQGHjTy25tPe1dolucbuubWDBhBWmRA2vXGN7bq5S8O0TQ6j0RwACRvfw59YUgB0d1 QKpfEJK9Xa8hnsH/7QSzScYNmpNafCIWdtPuZN5FvYuUUXgWnl5IavNKUTvTq+ISJ8Oz jYlyRH+I+iK4Xe4NYDDngW82XY2W3ZZ614pFL4xWNRjWG1W4riWYXlGLJS5adspr+Sac MlE7GGKPG7FLJlPfBVNSMl2PVRqwwKbuOseEsABcQuS6upCj8ECt8uNTo2ciUpIDn66l c2aczHL25R0m7W2gJ2OPtErxJRsJ7kI+ZVOeKjhZ+cJs8ODIiHIBLBs5rnCUNOc4AGyj z0EQ== Received: by 10.68.240.73 with SMTP id vy9mr69311802pbc.102.1341935810310; Tue, 10 Jul 2012 08:56:50 -0700 (PDT) Received: from localhost.localdomain ([221.221.21.23]) by mx.google.com with ESMTPS id oq4sm3056662pbb.21.2012.07.10.08.56.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 08:56:48 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [RFC PATCH 13/14] r8169/PCI: use PCIe cap access functions to simplify implementation Date: Tue, 10 Jul 2012 23:54:14 +0800 Message-Id: <1341935655-5381-14-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> References: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Use PCIe cap access functions to simplify r8169 driver implementation Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- 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);