[PATCH] powerpc/pci: Fix build with PCI_IOV=y and EEH=n

Despite attempting to fix this in commit fb36e9073693 ("powerpc/pci: Fix
SRIOV not building without EEH enabled"), the build is still broken when
PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):

  arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
  arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable ‘edev’

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/kernel/pci_dn.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index bfe60a1e70d9..e056c9e7b474 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c

@@ -227,7 +227,9 @@ void remove_dev_pci_data(struct pci_dev *pdev)
 #ifdef CONFIG_PCI_IOV
 	struct pci_dn *parent;
 	struct pci_dn *pdn, *tmp;
+#ifdef CONFIG_EEH
 	struct eeh_dev *edev;
+#endif
 	int i;
 
 	/*

-- 
2.7.4

On Tue, 2016-07-05 at 14:13 +1000, Michael Ellerman wrote:

Despite attempting to fix this in commit fb36e9073693 ("powerpc/pci: Fix
SRIOV not building without EEH enabled"), the build is still broken when
PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):

  arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
  arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable ‘edev’

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

Mistakes were made.

Acked-by: Russell Currey <redacted>

On Tue, 2016-07-05 at 14:30 +1000, Russell Currey wrote:

On Tue, 2016-07-05 at 14:13 +1000, Michael Ellerman wrote:

quoted

Despite attempting to fix this in commit fb36e9073693

("powerpc/pci: Fix

quoted

SRIOV not building without EEH enabled"), the build is still broken

when

quoted

PCI_IOV=y and EEH=n (eg. g5_defconfig with PCI_IOV=y):

  arch/powerpc/kernel/pci_dn.c: In function ‘remove_dev_pci_data’:
  arch/powerpc/kernel/pci_dn.c:230:18: error: unused variable

‘edev’

quoted

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

Mistakes were made.

The fix [PATCH 40/41] powerpc/pci: Fix build of Book3E/64 without EEH
in my series should subsume this... provided I didnt screw up that is
:-)

Cheers,
Ben.