1 files changed, 2 insertions, 4 deletions

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index ea961445e0e9..b23c8e4f28e8 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -536,16 +536,14 @@ static void __init ap_init_of(void)
                                            'A' + (ap_sc_id & 0x0f));
 
         soc_dev = soc_device_register(soc_dev_attr);
-        if (IS_ERR_OR_NULL(soc_dev)) {
+        if (IS_ERR(soc_dev)) {
                 kfree(soc_dev_attr->revision);
                 kfree(soc_dev_attr);
                 return;
         }
 
         parent = soc_device_to_device(soc_dev);
-
-        if (!IS_ERR_OR_NULL(parent))
-                integrator_init_sysfs(parent, ap_sc_id);
+        integrator_init_sysfs(parent, ap_sc_id);
 
         of_platform_populate(root, of_default_bus_match_table,
                         ap_auxdata_lookup, parent);