From: poza@codeaurora.org
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Rajat Jain <rajatja@google.com>
Subject: Re: [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
Date: Thu, 02 Aug 2018 12:04:16 +0530 [thread overview]
Message-ID: <b26226ae6c1d0a78f2ab1fac9894df7a@codeaurora.org> (raw)
In-Reply-To: <153307741056.12895.16173953885240310937.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 2018-08-01 04:20, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> PCI_EXP_AER_FLAGS was defined twice (with identical definitions), once
> under #ifdef CONFIG_ACPI_APEI, and again at the top level. This looks
> like
> my merge error from these commits:
>
> fd3362cb73de ("PCI/AER: Squash aerdrv_core.c into aerdrv.c")
> 41cbc9eb1a82 ("PCI/AER: Squash ecrc.c into aerdrv.c")
>
> Remove the duplicate PCI_EXP_AER_FLAGS definition.
>
> Fixes: 41cbc9eb1a82 ("PCI/AER: Squash ecrc.c into aerdrv.c")
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/pcie/aer.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index 2b344c9e2d46..c6cc855bfa22 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -329,8 +329,6 @@ int pcie_aer_get_firmware_first(struct pci_dev
> *dev)
> aer_set_firmware_first(dev);
> return dev->__aer_firmware_first;
> }
> -#define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE | PCI_EXP_DEVCTL_NFERE
> | \
> - PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE)
>
> static bool aer_firmware_first;
Reviewed-by: Oza Pawandeep <poza@codeaurora.org>
prev parent reply other threads:[~2018-08-02 6:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 22:50 [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition Bjorn Helgaas
2018-08-02 6:34 ` poza [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=b26226ae6c1d0a78f2ab1fac9894df7a@codeaurora.org \
--to=poza@codeaurora.org \
--cc=helgaas@kernel.org \
--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 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.