From patchwork Tue Jul 10 15:54:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 170228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C880F2C01B4 for ; Wed, 11 Jul 2012 01:57:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756040Ab2GJP4N (ORCPT ); Tue, 10 Jul 2012 11:56:13 -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 S1752464Ab2GJP4L (ORCPT ); Tue, 10 Jul 2012 11:56:11 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so456687pbb.19 for ; Tue, 10 Jul 2012 08:56:11 -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=zi9nEp6mRlvgCkITxcUqJuH3X4q2ZSNBwY5iWQp171M=; b=RhuvBZnFdESB6w8O4B9Z4AamZZSJ0FJpYyH4WbdltSt6YiPMyaCCEOszRqwW72Ad6Z K9dgpYwp8ZR68TI32W9+vo9GDYgzqrEIuA6Gl0Zwj+IgoeiIPZm7axcGe110qOlgn0CO qZ5rUcBewHEM1bY85pMoF+cu+D129ZL/JYfcQRKYFIWJVcjFyC/FS+77G/VODR681KUn oZ4wmPbV1IoDgSdnCjJmBGazcXEV4YhnOR0KGOqpyBwN65Jf7B73A9kJHZ6rRIxn3Oy3 H2+4hFFBcEhPde952qCzuHwcKqRowU7en2qbI4j9J2OqnmOqvRU99mhBArr5IIc501LO ZxwQ== Received: by 10.68.202.99 with SMTP id kh3mr54072966pbc.157.1341935771364; Tue, 10 Jul 2012 08:56:11 -0700 (PDT) Received: from localhost.localdomain ([221.221.21.23]) by mx.google.com with ESMTPS id oq4sm3056662pbb.21.2012.07.10.08.56.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 08:56:10 -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 09/14] pciehp/PCI: use PCIe cap access functions to simplify implementation Date: Tue, 10 Jul 2012 23:54:10 +0800 Message-Id: <1341935655-5381-10-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 PCIe hotplug implementation Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- drivers/pci/hotplug/pciehp_acpi.c | 5 +---- drivers/pci/hotplug/pciehp_hpc.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c index 376d70d..6b60301 100644 --- a/drivers/pci/hotplug/pciehp_acpi.c +++ b/drivers/pci/hotplug/pciehp_acpi.c @@ -81,16 +81,13 @@ static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots); /* Dummy driver for dumplicate name detection */ static int __init dummy_probe(struct pcie_device *dev) { - int pos; u32 slot_cap; acpi_handle handle; struct dummy_slot *slot, *tmp; struct pci_dev *pdev = dev->port; - pos = pci_pcie_cap(pdev); - if (!pos) + if (pci_pcie_cap_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap)) return -ENODEV; - pci_read_config_dword(pdev, pos + PCI_EXP_SLTCAP, &slot_cap); slot = kzalloc(sizeof(*slot), GFP_KERNEL); if (!slot) return -ENOMEM; diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index a960fae..d184754 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -44,25 +44,25 @@ static inline int pciehp_readw(struct controller *ctrl, int reg, u16 *value) { struct pci_dev *dev = ctrl->pcie->port; - return pci_read_config_word(dev, pci_pcie_cap(dev) + reg, value); + return pci_pcie_cap_read_word(dev, reg, value); } static inline int pciehp_readl(struct controller *ctrl, int reg, u32 *value) { struct pci_dev *dev = ctrl->pcie->port; - return pci_read_config_dword(dev, pci_pcie_cap(dev) + reg, value); + return pci_pcie_cap_read_dword(dev, reg, value); } static inline int pciehp_writew(struct controller *ctrl, int reg, u16 value) { struct pci_dev *dev = ctrl->pcie->port; - return pci_write_config_word(dev, pci_pcie_cap(dev) + reg, value); + return pci_pcie_cap_write_word(dev, reg, value); } static inline int pciehp_writel(struct controller *ctrl, int reg, u32 value) { struct pci_dev *dev = ctrl->pcie->port; - return pci_write_config_dword(dev, pci_pcie_cap(dev) + reg, value); + return pci_pcie_cap_write_dword(dev, reg, value); } /* Power Control Command */