* [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
@ 2018-07-31 22:50 Bjorn Helgaas
2018-08-02 6:34 ` poza
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Helgaas @ 2018-07-31 22:50 UTC (permalink / raw)
To: linux-pci; +Cc: linux-kernel, Oza Pawandeep, Rajat Jain
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
2018-07-31 22:50 [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition Bjorn Helgaas
@ 2018-08-02 6:34 ` poza
0 siblings, 0 replies; 2+ messages in thread
From: poza @ 2018-08-02 6:34 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel, Rajat Jain
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-02 6:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-31 22:50 [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition Bjorn Helgaas
2018-08-02 6:34 ` poza
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).