lkml.org 
[lkml]   [2018]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition
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>

\
 
 \ /
  Last update: 2018-08-02 08:34    [W:0.038 / U:3.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site