Commit 11a3bd09 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas

ia64/PCI: Use pci_is_bridge() to simplify code

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

Requires: 326c1cda PCI: Rename pci_is_bridge() to pci_has_subordinate()
Requires: 1c86438c PCI: Add new pci_is_bridge() interface
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 56a41f99
...@@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev) ...@@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
* type BRIDGE, or CARDBUS. Host to PCI controllers use * type BRIDGE, or CARDBUS. Host to PCI controllers use
* PCI header type NORMAL. * PCI header type NORMAL.
*/ */
if (bridge if (bridge && (pci_is_bridge(bridge))) {
&&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE)
||(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) {
pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
&config); &config);
if (!(config & PCI_BRIDGE_CTL_VGA)) if (!(config & PCI_BRIDGE_CTL_VGA))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment