x86/PCI: Use pci_is_bridge() to simplify code

Use pci_is_bridge() to simplify code.  No functional change.

Requires: 326c1cdae741 PCI: Rename pci_is_bridge() to pci_has_subordinate()
Requires: 1c86438c9423 PCI: Add new pci_is_bridge() interface
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 94ae9ae9574f..e5f000c02177 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -337,9 +337,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
                  * type BRIDGE, or CARDBUS. Host to PCI controllers use
                  * PCI header type NORMAL.
                  */
-                if (bridge
-                    && ((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                       || (bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) {
+                if (bridge && (pci_is_bridge(bridge))) {
                         pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
                                                 &config);
                         if (!(config & PCI_BRIDGE_CTL_VGA))