* [PATCH] PCI: versatile: include pci.h
@ 2018-05-28 15:48 Arnd Bergmann
2018-05-30 15:20 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2018-05-28 15:48 UTC (permalink / raw)
To: Rob Herring, Lorenzo Pieralisi, Bjorn Helgaas
Cc: Arnd Bergmann, Jingoo Han, Jan Kiszka, linux-kernel,
Vladimir Zapolskiy, linux-pci, linux-arm-kernel
Two patches for PCI host drivers clashed recently, leading to a broken
build for versatile-pci:
drivers/pci/host/pci-versatile.c: In function 'versatile_pci_parse_request_of_pci_ranges':
drivers/pci/host/pci-versatile.c:70:8: error: implicit declaration of function 'devm_of_pci_get_host_bridge_resources'; did you mean 'pci_get_host_bridge_device'? [-Werror=implicit-function-declaration]
This adds the missing header inclusion that became necessary now.
Fixes: 9e2aee80c78d ("PCI: Move private DT related functions into private header")
Fixes: 64720fd1f630 ("PCI: Rework of_pci_get_host_bridge_resources() to devm_of_pci_get_host_bridge_resources()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/pci/host/pci-versatile.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index ff2cd12b3978..994f32061b32 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -15,6 +15,8 @@
#include <linux/pci.h>
#include <linux/platform_device.h>
+#include "../pci.h"
+
static void __iomem *versatile_pci_base;
static void __iomem *versatile_cfg_base[2];
--
2.9.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PCI: versatile: include pci.h
2018-05-28 15:48 [PATCH] PCI: versatile: include pci.h Arnd Bergmann
@ 2018-05-30 15:20 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2018-05-30 15:20 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Rob Herring, Lorenzo Pieralisi, Jan Kiszka, linux-pci,
linux-kernel, linux-arm-kernel, Jingoo Han, Bjorn Helgaas,
Vladimir Zapolskiy
On Mon, May 28, 2018 at 05:48:39PM +0200, Arnd Bergmann wrote:
> Two patches for PCI host drivers clashed recently, leading to a broken
> build for versatile-pci:
>
> drivers/pci/host/pci-versatile.c: In function 'versatile_pci_parse_request_of_pci_ranges':
> drivers/pci/host/pci-versatile.c:70:8: error: implicit declaration of function 'devm_of_pci_get_host_bridge_resources'; did you mean 'pci_get_host_bridge_device'? [-Werror=implicit-function-declaration]
>
> This adds the missing header inclusion that became necessary now.
>
> Fixes: 9e2aee80c78d ("PCI: Move private DT related functions into private header")
> Fixes: 64720fd1f630 ("PCI: Rework of_pci_get_host_bridge_resources() to devm_of_pci_get_host_bridge_resources()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks, I added this in the merge where these two commits came together,
so hopefully there should be no bisection hole.
> ---
> drivers/pci/host/pci-versatile.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
> index ff2cd12b3978..994f32061b32 100644
> --- a/drivers/pci/host/pci-versatile.c
> +++ b/drivers/pci/host/pci-versatile.c
> @@ -15,6 +15,8 @@
> #include <linux/pci.h>
> #include <linux/platform_device.h>
>
> +#include "../pci.h"
> +
> static void __iomem *versatile_pci_base;
> static void __iomem *versatile_cfg_base[2];
>
> --
> 2.9.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-30 15:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-28 15:48 [PATCH] PCI: versatile: include pci.h Arnd Bergmann
2018-05-30 15:20 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).