From patchwork Tue Jul 24 16:31:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1232311 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 705393FD4F for ; Tue, 24 Jul 2012 16:38:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932088Ab2GXQf2 (ORCPT ); Tue, 24 Jul 2012 12:35:28 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:39412 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753909Ab2GXQf0 (ORCPT ); Tue, 24 Jul 2012 12:35:26 -0400 Received: by pbbrp8 with SMTP id rp8so12916328pbb.19 for ; Tue, 24 Jul 2012 09:35:26 -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=EAJTQ+PXNZkFoCo0B8TABFqLl99BSWrTjKMpCnfKD1g=; b=JNPEtYdZ0i93TsHYWi+R2ZdOX7v/kXrOLnoYuzvRR0xa/3mBzCMY0u8qaikHsCicU+ bxLb+nZvQEI0kMjya582tQtA6A+AvniNrnjnFJh+p6u9C7zfGAcIB9OPD11KJbQvFV6g UG2sLOiTGhH16EnpJLlOmyUPYm58HDiVQCN1LPYcihsX8q07oqjV/aoK5AzoZ+GOS/BK B/BGoYP9iWMvBR22BKLYodGHqQu4ko69lOOAmK16J6sZ3ZsYFUqMMk3O5XTYHaNNTiGX 7+h2v0htd5OmdfmxDB5xcEtn5HFe3pdLkCp7tC81dQRMdiBYNmdWq/3cURoMZko5vaQR Ngfg== Received: by 10.68.192.40 with SMTP id hd8mr29547094pbc.125.1343147726572; Tue, 24 Jul 2012 09:35:26 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.244]) by mx.google.com with ESMTPS id wi6sm12457583pbc.35.2012.07.24.09.35.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 09:35:26 -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 13/32] PCI/MIPS: use PCIe capabilities access functions to simplify implementation Date: Wed, 25 Jul 2012 00:31:25 +0800 Message-Id: <1343147504-25891-14-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 MIPS implementation. Signed-off-by: Jiang Liu --- arch/mips/pci/pci-octeon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 52a1ba7..fac6308 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c @@ -117,15 +117,14 @@ int pcibios_plat_dev_init(struct pci_dev *dev) } /* Enable the PCIe normal error reporting */ - pos = pci_find_capability(dev, PCI_CAP_ID_EXP); - if (pos) { + if (pci_is_pcie(dev)) { /* Update Device Control */ - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &config); + pci_pcie_capability_read_word(dev, PCI_EXP_DEVCTL, &config); config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config); + pci_pcie_capability_write_word(dev, PCI_EXP_DEVCTL, config); } /* Find the Advanced Error Reporting capability */