lkml.org 
[lkml]   [2012]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 09/14] pciehp/PCI: use PCIe cap access functions to simplify implementation
    Date
    From: Jiang Liu <jiang.liu@huawei.com>

    Use PCIe cap access functions to simplify PCIe hotplug implementation

    Signed-off-by: Jiang Liu <liuj97@gmail.com>
    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    ---
    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 */
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-07-10 20:01    [W:0.024 / U:34.680 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site