[PATCH 05/24] s390: check/return actual error on sysfs init

[Jeff Liu <jeff.liu@xxxxxxxxxx>]

From: Jie Liu <jeff.liu@xxxxxxxxxx>

Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
---
 arch/s390/kernel/ipl.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 633ca75..ee284e8 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -580,8 +580,8 @@ static int __init ipl_init(void)
 	int rc;
 
 	ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj);
-	if (!ipl_kset) {
-		rc = -ENOMEM;
+	if (IS_ERR(ipl_kset)) {
+		rc = PTR_ERR(ipl_kset);
 		goto out;
 	}
 	switch (ipl_info.type) {
@@ -1230,9 +1230,9 @@ static int __init reipl_fcp_init(void)
 	/* sysfs: create fcp kset for mixing attr group and bin attrs */
 	reipl_fcp_kset = kset_create_and_add(IPL_FCP_STR, NULL,
 					     &reipl_kset->kobj);
-	if (!reipl_fcp_kset) {
+	if (IS_ERR(reipl_fcp_kset)) {
 		free_page((unsigned long) reipl_block_fcp);
-		return -ENOMEM;
+		return PTR_ERR(ieipl_fcp_kset);
 	}
 
 	rc = sysfs_create_group(&reipl_fcp_kset->kobj, &reipl_fcp_attr_group);
@@ -1292,8 +1292,8 @@ static int __init reipl_init(void)
 	int rc;
 
 	reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj);
-	if (!reipl_kset)
-		return -ENOMEM;
+	if (IS_ERR(reipl_kset))
+		return PTR_ERR(reipl_kset);
 	rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr);
 	if (rc) {
 		kset_unregister(reipl_kset);
@@ -1510,8 +1510,8 @@ static int __init dump_init(void)
 	int rc;
 
 	dump_kset = kset_create_and_add("dump", NULL, firmware_kobj);
-	if (!dump_kset)
-		return -ENOMEM;
+	if (IS_ERR(dump_kset))
+		return PTR_ERR(dump_kset);
 	rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr.attr);
 	if (rc) {
 		kset_unregister(dump_kset);
@@ -1616,8 +1616,8 @@ static int vmcmd_init(void)
 	if (!MACHINE_IS_VM)
 		return -EOPNOTSUPP;
 	vmcmd_kset = kset_create_and_add("vmcmd", NULL, firmware_kobj);
-	if (!vmcmd_kset)
-		return -ENOMEM;
+	if (IS_ERR(vmcmd_kset))
+		return PTR_ERR(vmcmd_kset);
 	return sysfs_create_group(&vmcmd_kset->kobj, &vmcmd_attr_group);
 }
 
@@ -1828,7 +1828,7 @@ static void __init shutdown_triggers_init(void)
 {
 	shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL,
 						    firmware_kobj);
-	if (!shutdown_actions_kset)
+	if (IS_ERR(shutdown_actions_kset))
 		goto fail;
 	if (sysfs_create_file(&shutdown_actions_kset->kobj,
 			      &on_reboot_attr.attr))
-- 
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html