From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Fri, 25 Apr 2014 09:18:32 +0000 Subject: [PATCH 10/13] PCI, cpcihp: Use new pci_is_bridge() to simplify code Message-Id: <1398417515-8740-11-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 --- drivers/pci/hotplug/cpci_hotplug_pci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c index 8c14648..9843371 100644 --- a/drivers/pci/hotplug/cpci_hotplug_pci.c +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c @@ -289,8 +289,7 @@ int __ref cpci_configure_slot(struct slot *slot) list_for_each_entry(dev, &parent->devices, bus_list) if (PCI_SLOT(dev->devfn) != PCI_SLOT(slot->devfn)) continue; - if ((dev->hdr_type = PCI_HEADER_TYPE_BRIDGE) || - (dev->hdr_type = PCI_HEADER_TYPE_CARDBUS)) + if (pci_is_bridge(dev)) pci_hp_add_bridge(dev); -- 1.7.1