From: Bjorn Helgaas <helgaas@kernel.org>
To: Clint Sbisa <csbisa@amazon.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Jiri Kosina <trivial@kernel.org>,
Benjamin Herrenschmidt <benh@amazon.com>,
Ali Saidi <alisaidi@amazon.com>,
David Woodhouse <dwmw@amazon.co.uk>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI: Trivial comment fixup for PCI mmap ifdefs
Date: Thu, 17 Sep 2020 12:09:35 -0500 [thread overview]
Message-ID: <20200917170935.GA1710267@bjorn-Precision-5520> (raw)
In-Reply-To: <20200821155121.nzxjeeoze4h5pone@amazon.com>
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
>
prev parent reply other threads:[~2020-09-17 17:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 15:51 Clint Sbisa
2020-09-17 17:09 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200917170935.GA1710267@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=alisaidi@amazon.com \
--cc=benh@amazon.com \
--cc=bhelgaas@google.com \
--cc=csbisa@amazon.com \
--cc=dwmw@amazon.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®