From patchwork Tue Jul 24 16:31:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1232321 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 49C8F3FD4F for ; Tue, 24 Jul 2012 16:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753724Ab2GXQfU (ORCPT ); Tue, 24 Jul 2012 12:35:20 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:59725 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753909Ab2GXQfS (ORCPT ); Tue, 24 Jul 2012 12:35:18 -0400 Received: by mail-gh0-f174.google.com with SMTP id r11so6852686ghr.19 for ; Tue, 24 Jul 2012 09:35:18 -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; bh=wOjfFuhHvrr4ZlPd2cxo5KeqxCMM1sqIhsZhkke9/jo=; b=iHk4LbgI84SC2AhjpxHq2uyd5+3iwxt5VkNJCZjXsi90HCr4wyBfjGynzXo/xoXZ9/ vNirZPrbWPA7fVFnYnwWNqPEnHv3HLGpqwgk22ekaw2mN/wZEb699ewmzjn/ixeo2hwt yfJ9YXUFRoIXaYswdoD7+ZRzSLL4SJLzXLw/E5SbbffeaoFErV0R7IyA7yu33Yqzary7 UV5K3v1gyVAm4BXZIZrZlUtYJ1qeGdstL7wRJFGQhyTeHIXj3+de0n+I/uH1pfzs1Eqs URmiQjODAvapkWgggITiKv9ypAAFNsk8/NE3cT2UGAOKiS3poFv3lQxtSOmeHBpdKqdv L+mA== Received: by 10.66.87.138 with SMTP id ay10mr5907418pab.38.1343147717811; Tue, 24 Jul 2012 09:35:17 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.244]) by mx.google.com with ESMTPS id wi6sm12457583pbc.35.2012.07.24.09.35.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 09:35:17 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [RFC PATCH v2 12/32] PCI/ARM: use PCIe capabilities access functions to simplify implementation Date: Wed, 25 Jul 2012 00:31:24 +0800 Message-Id: <1343147504-25891-13-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343147504-25891-1-git-send-email-jiang.liu@huawei.com> References: <1343147504-25891-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Use PCIe capabilities access functions to simplify PCIe ARM implementation. Signed-off-by: Jiang Liu --- arch/arm/mach-tegra/pcie.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 0e09137..e41e64d 100644 --- a/arch/arm/mach-tegra/pcie.c +++ b/arch/arm/mach-tegra/pcie.c @@ -368,16 +368,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class); static void __devinit tegra_pcie_relax_enable(struct pci_dev *dev) { u16 val16; - int pos = pci_find_capability(dev, PCI_CAP_ID_EXP); - if (pos <= 0) { + if (!pci_is_pcie(dev)) { dev_err(&dev->dev, "skipping relaxed ordering fixup\n"); return; } - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &val16); + pci_pcie_capability_read_word(dev, PCI_EXP_DEVCTL, &val16); val16 |= PCI_EXP_DEVCTL_RELAX_EN; - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, val16); + pci_pcie_capability_write_word(dev, PCI_EXP_DEVCTL, val16); } DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);