From: Bjorn Helgaas <helgaas@kernel.org>
To: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Cc: Rajat Jain <rajatja@google.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] PCI: Make pci_aer_init() when !CONFIG_PCIEAER void too
Date: Fri, 12 Apr 2019 09:13:08 -0500 [thread overview]
Message-ID: <20190412141308.GC141472@google.com> (raw)
In-Reply-To: <20190412143458.2120118b@xhacker.debian>
On Fri, Apr 12, 2019 at 06:43:06AM +0000, Jisheng Zhang wrote:
> Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to
> drivers/pci/pci.h") makes pci_aer_init() void, but the version when
> !CONFIG_PCIEAER isn't modified accordingly, fix it.
>
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Added a stable tag and applied to pci/aer for v5.2, thanks!
> ---
> drivers/pci/pci.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index d994839a3e24..9cb99380c61e 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -597,7 +597,7 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev);
> void pci_aer_clear_device_status(struct pci_dev *dev);
> #else
> static inline void pci_no_aer(void) { }
> -static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }
> +static inline void pci_aer_init(struct pci_dev *d) { }
> static inline void pci_aer_exit(struct pci_dev *d) { }
> static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }
> static inline void pci_aer_clear_device_status(struct pci_dev *dev) { }
> --
> 2.20.1
>
prev parent reply other threads:[~2019-04-12 14:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 6:43 [PATCH] PCI: Make pci_aer_init() when !CONFIG_PCIEAER void too Jisheng Zhang
2019-04-12 14:13 ` 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=20190412141308.GC141472@google.com \
--to=helgaas@kernel.org \
--cc=Jisheng.Zhang@synaptics.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rajatja@google.com \
/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