From patchwork Sun May 4 04:23:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 345407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3BB94140116 for ; Sun, 4 May 2014 14:26:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751390AbaEDE0a (ORCPT ); Sun, 4 May 2014 00:26:30 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:3431 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbaEDE02 (ORCPT ); Sun, 4 May 2014 00:26:28 -0400 Received: from 172.24.2.119 (EHLO szxeml207-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BTH59554; Sun, 04 May 2014 12:26:16 +0800 (CST) Received: from SZXEML457-HUB.china.huawei.com (10.82.67.200) by szxeml207-edg.china.huawei.com (172.24.2.56) with Microsoft SMTP Server (TLS) id 14.3.158.1; Sun, 4 May 2014 12:26:14 +0800 Received: from localhost (10.177.27.212) by szxeml457-hub.china.huawei.com (10.82.67.200) with Microsoft SMTP Server id 14.3.158.1; Sun, 4 May 2014 12:26:08 +0800 From: Yijing Wang To: Bjorn Helgaas CC: Benjamin Herrenschmidt , , , Tony Luck , , "David S. Miller" , , Thomas Gleixner , , Yijing Wang 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> X-Mailer: git-send-email 1.7.11.msysgit.1 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 X-Originating-IP: [10.177.27.212] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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))