2 files changed, 4 insertions, 20 deletions

diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 945e8f4db873..3ab88a9dc70d 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -56,21 +56,6 @@ static inline int config_access_valid(struct pci_dn *dn, int where)
         return 0;
 }
 
-static int of_device_available(struct device_node * dn)
-{
-        const char *status;
-
-        status = of_get_property(dn, "status", NULL);
-
-        if (!status)
-                return 1;
-
-        if (!strcmp(status, "okay"))
-                return 1;
-
-        return 0;
-}
-
 int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
 {
         int returnval = -1;
@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct pci_bus *bus,
         for (dn = busdn->child; dn; dn = dn->sibling) {
                 struct pci_dn *pdn = PCI_DN(dn);
                 if (pdn && pdn->devfn == devfn
-                    && of_device_available(dn))
+                    && of_device_is_available(dn))
                         return rtas_read_config(pdn, where, size, val);
         }
 
@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct pci_bus *bus,
         for (dn = busdn->child; dn; dn = dn->sibling) {
                 struct pci_dn *pdn = PCI_DN(dn);
                 if (pdn && pdn->devfn == devfn
-                    && of_device_available(dn))
+                    && of_device_is_available(dn))
                         return rtas_write_config(pdn, where, size, val);
         }
         return PCIBIOS_DEVICE_NOT_FOUND;
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 9eb539ee5f9a..550b2f7d2cc1 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         unsigned int rets[3];
         struct eeh_early_enable_info *info = data;
         int ret;
-        const char *status = of_get_property(dn, "status", NULL);
         const u32 *class_code = of_get_property(dn, "class-code", NULL);
         const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
         const u32 *device_id = of_get_property(dn, "device-id", NULL);
@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         pdn->eeh_freeze_count = 0;
         pdn->eeh_false_positives = 0;
 
-        if (status && strncmp(status, "ok", 2) != 0)
-                return NULL;    /* ignore devices with bad status */
+        if (!of_device_is_available(dn))
+                return NULL;
 
         /* Ignore bad nodes. */
         if (!class_code || !vendor_id || !device_id)