Skip to content

Commit

Permalink
ia64/PCI: Use pci_is_bridge() to simplify code
Browse files Browse the repository at this point in the history
Use pci_is_bridge() to simplify code.  No functional change.

Requires: 326c1cd PCI: Rename pci_is_bridge() to pci_has_subordinate()
Requires: 1c86438 PCI: Add new pci_is_bridge() interface
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Yijing Wang authored and Bjorn Helgaas committed May 27, 2014
1 parent 56a41f9 commit 11a3bd0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/ia64/pci/fixup.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,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))
Expand Down

0 comments on commit 11a3bd0

Please sign in to comment.