From patchwork Wed Nov 4 12:39:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7549651 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9DE61BEEA4 for ; Wed, 4 Nov 2015 12:39:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF53C2070D for ; Wed, 4 Nov 2015 12:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B8EE720707 for ; Wed, 4 Nov 2015 12:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965287AbbKDMj4 (ORCPT ); Wed, 4 Nov 2015 07:39:56 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:62211 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965135AbbKDMjz (ORCPT ); Wed, 4 Nov 2015 07:39:55 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0McyCA-1aC2Sz1Umo-00IDkE; Wed, 04 Nov 2015 13:39:43 +0100 From: Arnd Bergmann To: linux-pci@vger.kernel.org, Bjorn Helgaas Cc: marc.zyngier@arm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, Ley Foon Tan Subject: [PATCH] PCI: altera: use fwnode API for pci_msi_create_irq_domain Date: Wed, 04 Nov 2015 13:39:42 +0100 Message-ID: <4309044.Hy8Vx01ZVW@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:us2MTFoBJinySDWKZ5es5phmQYuO0y9PCgOuam0uGecLnaqpeN4 gcAHMkNG0omvEhE1vgK7/HlpAGgShMHRnq2u8b6WjR1RGc5bE/tA/eV1T0HHP3VPoa+kcu6 kyuXqTHgiBx76I68OrchlaZ12JbiqIO20gMJZs/hATjCKGv4fcmr6xHrv25SvgyTONODSDY bh9PW/yZSvYwHLhcV93og== X-UI-Out-Filterresults: notjunk:1; V01:K0:CvExuv/yleY=:Wm0dMu3oCb6KaIJuhi9pdc A1A5liZDJrTqmRQ8ol2ofSRoCObVNBfiovvIElf+9AuhGZw4aIIvbmNlFFcq1v8xX6TnVDxQA qnB2nc0sDH68vfR1o1jKLjPja3HJ4xc7pb0+HeWEGW+qAj28+E2rtosNtea0jMoy7prGcett7 /VnUMKfnyIFEJeINn15/dIh/hX84BcpTDZzCCNKVVcDO9yCF+QY8gSSRE67syXUYKi7UhQG7n +S75M6psK8f+jzakUkSi34B7E8RXXbx3mGg4mHXcmZlJTNb2HJ7g386SwQ9263sXp2TcQnZxn 7juK58jDBPxOs1Hi/Yxr7gJkDg9Fs/UcwgJkJC54kiOOxi1CNJ9wBe/XGXD+ojM5I8bArw3Ts pL43mFVNQaQzrZuv0yVj2upr0je3vfbbE+oyXaerHdxWnS6HDTFU7+W8cFPxyK589NuMS+qi7 b4UElmmEHmNfUA3KCpYfThNkyaf5ipNlTk3MhBhqGbITCI+KsFUJd2eix+Doq7FUxvwb9Isgj jAaNBnHQeo8kzyLwo8C+wWpl0EFs9VLncczC40RrBMl2c1hk4gV8hJ6DvEvGP44YobzvWRm1D NmvzAJLZsbAiTmDSG1ooovsIKtAq/On+DdIINYrYqCIvsQX/YI+OAfLuMjNIUyA9ur6u+3tqZ dVwATNfw8XC8cr4WAMaKZcAK/1C4ngllABCcRz0QX/zBwBaQjVpReO//ix2uFMLGNQ5EdrZ7T mohYE/xKMc67BnSI Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is a new conflict between Thomas Gleixner's IRQ tree that contains a patch from Marc Zyngier to change the prototype for pci_msi_create_irq_domain, and Bjorn Helgaas' PCI tree that contains a new driver for the Altera PCI MSI host, with the old interface, as gcc now warns in linux-next: drivers/pci/host/pcie-altera-msi.c: In function 'altera_allocate_domains': drivers/pci/host/pcie-altera-msi.c:191:46: warning: passing argument 1 of 'pci_msi_create_irq_domain' from incompatible pointer type [-Wincompatible-pointer-types] msi->msi_domain = pci_msi_create_irq_domain(msi->pdev->dev.of_node, include/linux/msi.h:286:20: note: expected 'struct fwnode_handle *' but argument is of type 'struct device_node *' This changes the new driver use the modified API. Signed-off-by: Arnd Bergmann Fixes: af1169b48b17 ("PCI: altera: Add Altera PCIe MSI driver") Fixes: be5436c83ac8 ("irqdomain/msi: Use fwnode instead of of_node") Acked-by: Ley Foon Tan --- This conflict seems to be new in linux-next today. Any idea how to resolve it? I think either Bjorn merges the msi-map-4.4 of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms and uses this as the resolution, or whichever pull request comes second should let Linus know about the conflict so he can do it when merging both. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/host/pcie-altera-msi.c b/drivers/pci/host/pcie-altera-msi.c index 2c37e8620c37..99177f4ccde2 100644 --- a/drivers/pci/host/pcie-altera-msi.c +++ b/drivers/pci/host/pcie-altera-msi.c @@ -181,6 +181,8 @@ static const struct irq_domain_ops msi_domain_ops = { static int altera_allocate_domains(struct altera_msi *msi) { + struct fwnode_handle *fwnode = of_node_to_fwnode(msi->pdev->dev.of_node); + msi->inner_domain = irq_domain_add_linear(NULL, msi->num_of_vectors, &msi_domain_ops, msi); if (!msi->inner_domain) { @@ -188,7 +190,7 @@ static int altera_allocate_domains(struct altera_msi *msi) return -ENOMEM; } - msi->msi_domain = pci_msi_create_irq_domain(msi->pdev->dev.of_node, + msi->msi_domain = pci_msi_create_irq_domain(fwnode, &altera_msi_domain_info, msi->inner_domain); if (!msi->msi_domain) { dev_err(&msi->pdev->dev, "failed to create MSI domain\n");