powerpc/powernv: Move PNV_EEH_STATE_ENABLED around

The flag PNV_EEH_STATE_ENABLED is put into pnv_phb::eeh_state,
which is protected by CONFIG_EEH. We needn't that. Instead, we
can have pnv_phb::flags and maintain all flags there, which is
the purpose of the patch. The patch also renames PNV_EEH_STATE_ENABLED
to PNV_PHB_FLAG_EEH.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 8518817dcdfd..114e1a700446 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -426,7 +426,7 @@ int pnv_pci_cfg_read(struct device_node *dn,
         if (phb_pe && (phb_pe->state & EEH_PE_ISOLATED))
                 return PCIBIOS_SUCCESSFUL;
 
-        if (phb->eeh_state & PNV_EEH_STATE_ENABLED) {
+        if (phb->flags & PNV_PHB_FLAG_EEH) {
                 if (*val == EEH_IO_ERROR_VALUE(size) &&
                     eeh_dev_check_failure(of_node_to_eeh_dev(dn)))
                         return PCIBIOS_DEVICE_NOT_FOUND;
@@ -464,12 +464,8 @@ int pnv_pci_cfg_write(struct device_node *dn,
         }
 
         /* Check if the PHB got frozen due to an error (no response) */
-#ifdef CONFIG_EEH
-        if (!(phb->eeh_state & PNV_EEH_STATE_ENABLED))
+        if (!(phb->flags & PNV_PHB_FLAG_EEH))
                 pnv_pci_config_check_eeh(phb, dn);
-#else
-        pnv_pci_config_check_eeh(phb, dn);
-#endif
 
         return PCIBIOS_SUCCESSFUL;
 }