[PATCH 1/1] PCI/AER: Change to use helper pcie_aer_is_native() in some places

[Xiaofei Tan]

Use helper function pcie_aer_is_native() in some places to keep
the code tidy. No function changes.

Signed-off-by: Xiaofei Tan <tanxiao...@huawei.com>
---
 drivers/pci/pcie/aer.c          | 4 ++--
 drivers/pci/pcie/err.c          | 2 +-
 drivers/pci/pcie/portdrv_core.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 77b0f2c..03212d0 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1397,7 +1397,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev 
*dev)
         */
        aer = root ? root->aer_cap : 0;
 
-       if ((host->native_aer || pcie_ports_native) && aer) {
+       if (pcie_aer_is_native(dev) && aer) {
                /* Disable Root's interrupt in response to error messages */
                pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, &reg32);
                reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
@@ -1417,7 +1417,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev 
*dev)
                pci_info(dev, "Root Port link has been reset (%d)\n", rc);
        }
 
-       if ((host->native_aer || pcie_ports_native) && aer) {
+       if (pcie_aer_is_native(dev) && aer) {
                /* Clear Root Error Status */
                pci_read_config_dword(root, aer + PCI_ERR_ROOT_STATUS, &reg32);
                pci_write_config_dword(root, aer + PCI_ERR_ROOT_STATUS, reg32);
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index 510f31f..1d6cfb9 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -237,7 +237,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
         * this status.  In that case, the signaling device may not even be
         * visible to the OS.
         */
-       if (host->native_aer || pcie_ports_native) {
+       if (pcie_aer_is_native(dev)) {
                pcie_clear_device_status(bridge);
                pci_aer_clear_nonfatal_status(bridge);
        }
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index e1fed664..1e6a690 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -222,7 +222,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 
 #ifdef CONFIG_PCIEAER
        if (dev->aer_cap && pci_aer_available() &&
-           (pcie_ports_native || host->native_aer)) {
+           pcie_aer_is_native(dev)) {
                services |= PCIE_PORT_SERVICE_AER;
 
                /*
-- 
2.8.1