diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-05-04 00:23:40 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-27 16:57:16 -0400 |
| commit | 11a3bd095cb1ab62545b3c2105bc11c942063568 (patch) | |
| tree | c727bff88a6b7103c48653d1911734b86bf8d28a /arch/ia64 | |
| parent | 56a41f9949f13dfcf6ceca15723d88d9f5288bb9 (diff) | |
ia64/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>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/pci/fixup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c index eee069a0b539..1fe9aa5068ea 100644 --- a/arch/ia64/pci/fixup.c +++ b/arch/ia64/pci/fixup.c | |||
| @@ -49,9 +49,7 @@ static void pci_fixup_video(struct pci_dev *pdev) | |||
| 49 | * type BRIDGE, or CARDBUS. Host to PCI controllers use | 49 | * type BRIDGE, or CARDBUS. Host to PCI controllers use |
| 50 | * PCI header type NORMAL. | 50 | * PCI header type NORMAL. |
| 51 | */ | 51 | */ |
| 52 | if (bridge | 52 | if (bridge && (pci_is_bridge(bridge))) { |
| 53 | &&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE) | ||
| 54 | ||(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) { | ||
| 55 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, | 53 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, |
| 56 | &config); | 54 | &config); |
| 57 | if (!(config & PCI_BRIDGE_CTL_VGA)) | 55 | if (!(config & PCI_BRIDGE_CTL_VGA)) |