drivers/pci/probe: Move variable bridge inside ifdef

Message ID 20180721214556.25651-1-anders.roxell@linaro.org
State New
Headers show
Series
  • drivers/pci/probe: Move variable bridge inside ifdef
Related show

Commit Message

Anders Roxell July 21, 2018, 9:45 p.m.
When CONFIG_PCI_QUIRKS isn't enabled we get the warning below:
drivers/pci/probe.c: In function ‘pci_bus_read_dev_vendor_id’:
drivers/pci/probe.c:2221:18: warning: unused variable ‘bridge’ [-Wunused-variable]
  struct pci_dev *bridge = bus->self;
                  ^~~~~~

Move the declaration of variable bridge to inside the ifdef
CONFIG_PCI_QUIRKS.

Fixes: ac5ea104a279 ("PCI: Workaround IDT switch ACS Source Validation erratum")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 drivers/pci/probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.18.0

Comments

Bjorn Helgaas July 23, 2018, 10:11 p.m. | #1
On Sat, Jul 21, 2018 at 11:45:56PM +0200, Anders Roxell wrote:
> When CONFIG_PCI_QUIRKS isn't enabled we get the warning below:

> drivers/pci/probe.c: In function ‘pci_bus_read_dev_vendor_id’:

> drivers/pci/probe.c:2221:18: warning: unused variable ‘bridge’ [-Wunused-variable]

>   struct pci_dev *bridge = bus->self;

>                   ^~~~~~

> 

> Move the declaration of variable bridge to inside the ifdef

> CONFIG_PCI_QUIRKS.

> 

> Fixes: ac5ea104a279 ("PCI: Workaround IDT switch ACS Source Validation erratum")

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


I folded this into the original commit on pci/enumeration, thanks!

> ---

>  drivers/pci/probe.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c

> index 1c581346c5b9..7a5323798312 100644

> --- a/drivers/pci/probe.c

> +++ b/drivers/pci/probe.c

> @@ -2218,9 +2218,9 @@ bool pci_bus_generic_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,

>  bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,

>  				int timeout)

>  {

> +#ifdef CONFIG_PCI_QUIRKS

>  	struct pci_dev *bridge = bus->self;

>  

> -#ifdef CONFIG_PCI_QUIRKS

>  	/*

>  	 * Certain IDT switches have an issue where they improperly trigger

>  	 * ACS Source Validation errors on completions for config reads.

> -- 

> 2.18.0

>

Patch

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 1c581346c5b9..7a5323798312 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2218,9 +2218,9 @@  bool pci_bus_generic_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
 bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
 				int timeout)
 {
+#ifdef CONFIG_PCI_QUIRKS
 	struct pci_dev *bridge = bus->self;
 
-#ifdef CONFIG_PCI_QUIRKS
 	/*
 	 * Certain IDT switches have an issue where they improperly trigger
 	 * ACS Source Validation errors on completions for config reads.