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 07/14] hotplug/PCI: use PCIe cap access functions to simplify implementation
Date
From: Jiang Liu <jiang.liu@huawei.com>

Use PCIe cap access functions to simplify pcihp_slot.c

Signed-off-by: Jiang Liu <liuj97@gmail.com>
---
drivers/pci/hotplug/pcihp_slot.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/hotplug/pcihp_slot.c b/drivers/pci/hotplug/pcihp_slot.c
index 8c05a18..08ca019 100644
--- a/drivers/pci/hotplug/pcihp_slot.c
+++ b/drivers/pci/hotplug/pcihp_slot.c
@@ -103,8 +103,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
return;

/* Find PCI Express capability */
- pos = pci_pcie_cap(dev);
- if (!pos)
+ if (!pci_is_pcie(dev))
return;

if (hpp->revision > 1) {
@@ -114,16 +113,18 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
}

/* Initialize Device Control Register */
- pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &reg16);
+ if (pci_pcie_cap_read_word(dev, PCI_EXP_DEVCTL, &reg16))
+ return;
reg16 = (reg16 & hpp->pci_exp_devctl_and) | hpp->pci_exp_devctl_or;
- pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, reg16);
+ pci_pcie_cap_write_word(dev, PCI_EXP_DEVCTL, reg16);

/* Initialize Link Control Register */
if (dev->subordinate) {
- pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &reg16);
- reg16 = (reg16 & hpp->pci_exp_lnkctl_and)
- | hpp->pci_exp_lnkctl_or;
- pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, reg16);
+ if (pci_pcie_cap_read_word(dev, PCI_EXP_LNKCTL, &reg16)) {
+ reg16 = (reg16 & hpp->pci_exp_lnkctl_and)
+ | hpp->pci_exp_lnkctl_or;
+ pci_pcie_cap_write_word(dev, PCI_EXP_LNKCTL, reg16);
+ }
}

/* Find Advanced Error Reporting Enhanced Capability */
--
1.7.9.5


\
 
 \ /
  Last update: 2012-07-10 20:01    [W:0.210 / U:2.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site