From: Stephen Rothwell Date: Wed, 7 Mar 2012 18:41:09 +0000 (+0000) Subject: driver-core: remove legacy iSeries hack X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fcd6f76202024763f2f4a348ab666240e4f7ac50;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git driver-core: remove legacy iSeries hack The PowerPC legacy iSeries plateform is being removed along with the "one looney iseries driver", so this code can now be removed as well. cc: Greg Kroah-Hartman Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt --- diff --git a/drivers/base/driver.c b/drivers/base/driver.c index b631f7c5945..db4f54c313a 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -123,36 +123,6 @@ void driver_remove_file(struct device_driver *drv, } EXPORT_SYMBOL_GPL(driver_remove_file); -/** - * driver_add_kobj - add a kobject below the specified driver - * @drv: requesting device driver - * @kobj: kobject to add below this driver - * @fmt: format string that names the kobject - * - * 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; - int ret; - - va_start(args, fmt); - name = kvasprintf(GFP_KERNEL, fmt, args); - va_end(args); - - if (!name) - return -ENOMEM; - - ret = kobject_add(kobj, &drv->p->kobj, "%s", name); - kfree(name); - return ret; -} -EXPORT_SYMBOL_GPL(driver_add_kobj); - /** * get_driver - increment driver reference count. * @drv: driver. diff --git a/include/linux/device.h b/include/linux/device.h index b63fb393aa5..46baa1fec34 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -264,10 +264,6 @@ extern int __must_check driver_create_file(struct device_driver *driver, extern void driver_remove_file(struct device_driver *driver, const struct driver_attribute *attr); -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,