From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Fri, 25 Apr 2014 09:18:26 +0000 Subject: [PATCH 04/13] x86/PCI: Use new pci_is_bridge() to simplify code Message-Id: <1398417515-8740-5-git-send-email-wangyijing@huawei.com> List-Id: References: <1398417515-8740-1-git-send-email-wangyijing@huawei.com> In-Reply-To: <1398417515-8740-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Thomas Gleixner , x86@kernel.org, Benjamin Herrenschmidt , Yijing Wang Now we can use new pci_is_bridge() helper function to simplify code. Signed-off-by: Yijing Wang --- 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 94ae9ae..e5f000c 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)) -- 1.7.1