diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-05-04 12:23:39 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 14:56:34 -0600 |
| commit | 56a41f9949f13dfcf6ceca15723d88d9f5288bb9 (patch) | |
| tree | dc3522d7ee6a4ba790b7a52a58c706ec969d70d9 | |
| parent | 6788a51fe3391817c8ded5f43dd4c57f3d212c17 (diff) | |
| download | linux-56a41f9949f13dfcf6ceca15723d88d9f5288bb9.tar.gz linux-56a41f9949f13dfcf6ceca15723d88d9f5288bb9.tar.bz2 linux-56a41f9949f13dfcf6ceca15723d88d9f5288bb9.zip | |
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>
| -rw-r--r-- | arch/x86/pci/fixup.c | 4 |
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)) |