Skip to contentSkip to conversation

drivers/base: return actual error on sysfs init

PATCH Applied Jeff Liu 2 participants 2 messages Jun 17, 2014 Driver core

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH 10/24 drivers/base: return actual error on sysfs init

From: Jie Liu <[email protected]>

This patch fix all sysfs init functions under drivers core to return the actual error code than the hardcoded ENOMEM.

Cc Greg Kroah-Hartman <[email protected]>
Signed-off-by Jie Liu <[email protected]>
---
 drivers/base/bus.c   | 16 ++++++++--------
 drivers/base/class.c |  4 ++--
 drivers/base/core.c  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/base/bus.c +8 -8
index 83e910a..b0590a7 100644
@@ -901,15 +901,15 @@ int bus_register(struct bus_type *bus)
 
 	priv->devices_kset = kset_create_and_add("devices", NULL,
 						 &priv->subsys.kobj);
-	if (!priv->devices_kset) {
-		retval = -ENOMEM;
+	if (IS_ERR(priv->devices_kset)) {
+		retval = PTR_ERR(priv->devices_kset);
 		goto bus_devices_fail;
 	}
 
 	priv->drivers_kset = kset_create_and_add("drivers", NULL,
 						 &priv->subsys.kobj);
-	if (!priv->drivers_kset) {
-		retval = -ENOMEM;
+	if (IS_ERR(priv->drivers_kset)) {
+		retval = PTR_ERR(priv->drivers_kset);
 		goto bus_drivers_fail;
 	}
 

@@ -1261,12 +1261,12 @@ EXPORT_SYMBOL_GPL(subsys_virtual_register);
 int __init buses_init(void)
 {
 	bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL);
-	if (!bus_kset)
-		return -ENOMEM;
+	if (IS_ERR(bus_kset))
+		return PTR_ERR(bus_kset);
 
 	system_kset = kset_create_and_add("system", NULL, &devices_kset->kobj);
-	if (!system_kset)
-		return -ENOMEM;
+	if (IS_ERR(system_kset))
+		return PTR_ERR(system_kset);
 
 	return 0;
 }
drivers/base/class.c +2 -2
index f96f704..56e16fa 100644
@@ -584,8 +584,8 @@ EXPORT_SYMBOL_GPL(class_compat_remove_link);
 int __init classes_init(void)
 {
 	class_kset = kset_create_and_add("class", NULL, NULL);
-	if (!class_kset)
-		return -ENOMEM;
+	if (IS_ERR(class_kset))
+		return PTR_ERR(class_kset);
 	return 0;
 }
drivers/base/core.c +2 -2
index 20da3ad..0f729f9 100644
@@ -1364,8 +1364,8 @@ EXPORT_SYMBOL_GPL(device_find_child);
 int __init devices_init(void)
 {
 	devices_kset = kset_create_and_add("devices", &device_uevent_ops, NULL);
-	if (!devices_kset)
-		return -ENOMEM;
+	if (IS_ERR(devices_kset))
+		return PTR_ERR(devices_kset);
 	dev_kobj = kobject_create_and_add("dev", NULL);
 	if (!dev_kobj)
 		goto dev_kobj_err;
Signature · 1 line
1.8.3.2
maintainer
#1 lore raw
Quoted 5 lines · Jeff Liu

From: Jie Liu <[email protected]>

This patch fix all sysfs init functions under drivers core to return the actual error code than the hardcoded ENOMEM.

Quoted 7 lines
Cc Greg Kroah-Hartman <[email protected]>
Signed-off-by Jie Liu <[email protected]>
---
 drivers/base/bus.c   | 16 ++++++++--------
 drivers/base/class.c |  4 ++--
 drivers/base/core.c  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

Nope, not taking this.