From patchwork Thu Jan 12 06:28:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongdong Liu X-Patchwork-Id: 9512171 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EBFCA601E5 for ; Thu, 12 Jan 2017 06:13:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBC2128635 for ; Thu, 12 Jan 2017 06:13:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD5A428634; Thu, 12 Jan 2017 06:13:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E68928634 for ; Thu, 12 Jan 2017 06:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750769AbdALGN2 (ORCPT ); Thu, 12 Jan 2017 01:13:28 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:50142 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbdALGN1 (ORCPT ); Thu, 12 Jan 2017 01:13:27 -0500 Received: from 172.24.1.60 (EHLO szxeml422-hub.china.huawei.com) ([172.24.1.60]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CNX03635; Thu, 12 Jan 2017 14:13:24 +0800 (CST) Received: from linux-ioko.site (10.71.200.31) by szxeml422-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.3.235.1; Thu, 12 Jan 2017 14:13:14 +0800 From: Dongdong Liu To: CC: , , , , , Dongdong Liu Subject: [PATCH 3/3] PCI: generic: Fix the bug of pci_fixup_irqs() for arm64 platform. Date: Thu, 12 Jan 2017 14:28:24 +0800 Message-ID: <1484202504-96686-4-git-send-email-liudongdong3@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484202504-96686-1-git-send-email-liudongdong3@huawei.com> References: <1484202504-96686-1-git-send-email-liudongdong3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.71.200.31] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP arch/arm64/pci.c pcibios_alloc_irq() has the same function as pci_fixup_irqs(), so we add condition #ifndef CONFIG_ARM64 for pci_fixup_irqs(). Signed-off-by: Dongdong Liu Reviewed-by: Gabriele Paoloni Reviewed-by: Zhou Wang --- drivers/pci/host/pci-host-common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c index e3c48b5..f160afc 100644 --- a/drivers/pci/host/pci-host-common.c +++ b/drivers/pci/host/pci-host-common.c @@ -145,7 +145,9 @@ int pci_host_common_probe(struct platform_device *pdev, return -ENODEV; } +#ifndef CONFIG_ARM64 pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); +#endif /* * We insert PCI resources into the iomem_resource and