---

yaml
---
r: 75837
b: refs/heads/master
c: cbe9c59
h: refs/heads/master
i:
  75835: 6cfacd8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23b9c1ab5baf368a32b7242bf110ef1f48700d04
+refs/heads/master: cbe9c595f1de2e2a98403be2c14bfbc2486e84c4

trunk/drivers/base/driver.c

@@ -123,6 +123,30 @@ void driver_remove_file(struct device_driver * drv, struct driver_attribute * at
 }
 
 
+/**
+ * driver_add_kobj - add a kobject below the specified driver
+ *
+ * You really don't want to do this, this is only here due to one looney
+ * iseries driver, go poke those developers if you are annoyed about
+ * this...
+ */
+int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
+		    const char *fmt, ...)
+{
+	va_list args;
+	char *name;
+
+	va_start(args, fmt);
+	name = kvasprintf(GFP_KERNEL, fmt, args);
+	va_end(args);
+
+	if (!name)
+		return -ENOMEM;
+
+	return kobject_add_ng(kobj, &drv->kobj, "%s", name);
+}
+EXPORT_SYMBOL_GPL(driver_add_kobj);
+
 /**
  *	get_driver - increment driver reference count.
  *	@drv:	driver.

trunk/drivers/net/iseries_veth.c

@@ -1705,7 +1705,7 @@ static int __init veth_module_init(void)
 
 		kobj = &veth_cnx[i]->kobject;
 		/* If the add failes, complain but otherwise continue */
-		if (0 != kobject_add_ng(kobj, &veth_driver.driver.kobj,
+		if (0 != driver_add_kobj(&veth_driver.driver, kobj,
 					"cnx%.2d", veth_cnx[i]->remote_lp))
 			veth_error("cnx %d: Failed adding to sysfs.\n", i);
 	}

trunk/include/linux/device.h

@@ -156,6 +156,10 @@ extern int __must_check driver_create_file(struct device_driver *,
 					struct driver_attribute *);
 extern void driver_remove_file(struct device_driver *, struct driver_attribute *);
 
+extern int __must_check driver_add_kobj(struct device_driver *drv,
+					struct kobject *kobj,
+					const char *fmt, ...);
+
 extern int __must_check driver_for_each_device(struct device_driver * drv,
 		struct device *start, void *data,
 		int (*fn)(struct device *, void *));