| Message ID | 20200821155121.nzxjeeoze4h5pone@amazon.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Trivial comment fixup for PCI mmap ifdefs | expand |
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 >
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
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(-)