* [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs
@ 2020-08-21 15:51 Clint Sbisa
2020-09-17 17:09 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Clint Sbisa @ 2020-08-21 15:51 UTC (permalink / raw)
To: Bjorn Helgaas, Jiri Kosina
Cc: Clint Sbisa, Benjamin Herrenschmidt, Ali Saidi, David Woodhouse,
linux-pci, linux-kernel
The else/endif comments for pci_{create,remove}_resource_files were
not updated in commit f719582435afe9c7985206e42d804ea6aa315d33 ("PCI:
Add pci_mmap_resource_range() and use it for ARM64").
Signed-off-by: Clint Sbisa <csbisa@amazon.com>
---
drivers/pci/pci-sysfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 6d78df981d41..cfc67b208616 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1196,10 +1196,10 @@ static int pci_create_resource_files(struct pci_dev *pdev)
}
return 0;
}
-#else /* !HAVE_PCI_MMAP */
+#else /* ! (defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)) */
int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; }
void __weak pci_remove_resource_files(struct pci_dev *dev) { return; }
-#endif /* HAVE_PCI_MMAP */
+#endif /* defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) */
/**
* pci_write_rom - used to enable access to the PCI ROM display
--
2.23.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs
2020-08-21 15:51 [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs Clint Sbisa
@ 2020-09-17 17:09 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2020-09-17 17:09 UTC (permalink / raw)
To: Clint Sbisa
Cc: Bjorn Helgaas, Jiri Kosina, Benjamin Herrenschmidt, Ali Saidi,
David Woodhouse, linux-pci, linux-kernel
On Fri, Aug 21, 2020 at 03:51:21PM +0000, Clint Sbisa wrote:
> The else/endif comments for pci_{create,remove}_resource_files were
> not updated in commit f719582435afe9c7985206e42d804ea6aa315d33 ("PCI:
> Add pci_mmap_resource_range() and use it for ARM64").
>
> Signed-off-by: Clint Sbisa <csbisa@amazon.com>
Applied to pci/misc for v5.10, thanks!
> ---
> drivers/pci/pci-sysfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 6d78df981d41..cfc67b208616 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -1196,10 +1196,10 @@ static int pci_create_resource_files(struct pci_dev *pdev)
> }
> return 0;
> }
> -#else /* !HAVE_PCI_MMAP */
> +#else /* ! (defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)) */
> int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; }
> void __weak pci_remove_resource_files(struct pci_dev *dev) { return; }
> -#endif /* HAVE_PCI_MMAP */
> +#endif /* defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) */
>
> /**
> * pci_write_rom - used to enable access to the PCI ROM display
> --
> 2.23.3
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-17 17:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-21 15:51 [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs Clint Sbisa
2020-09-17 17:09 ` Bjorn Helgaas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.