From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [119.145.14.65]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1E30214010B for ; Sun, 4 May 2014 14:26:45 +1000 (EST) From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v2 05/13] IA64/PCI: Use new pci_is_bridge() to simplify code Date: Sun, 4 May 2014 12:23:40 +0800 Message-ID: <1399177428-3784-6-git-send-email-wangyijing@huawei.com> In-Reply-To: <1399177428-3784-1-git-send-email-wangyijing@huawei.com> References: <1399177428-3784-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Cc: Tony Luck , linux-ia64@vger.kernel.org, x86@kernel.org, Yijing Wang , linux-pci@vger.kernel.org, sparclinux@vger.kernel.org, Thomas Gleixner , linuxppc-dev@lists.ozlabs.org, "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Now we can use new pci_is_bridge() helper function to simplify code. Signed-off-by: Yijing Wang --- 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 eee069a..1fe9aa5 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) * 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