diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-07 13:41:09 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-08 18:35:21 -0500 |
commit | fcd6f76202024763f2f4a348ab666240e4f7ac50 (patch) | |
tree | 823ab929d28b382d858262e791bf763fe4e2f237 | |
parent | c17a9d4c8495c3a8e724cc846240c46f660a726c (diff) |
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 <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | drivers/base/driver.c | 30 | ||||
-rw-r--r-- | include/linux/device.h | 4 |
2 files changed, 0 insertions, 34 deletions
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 | |||
@@ -124,36 +124,6 @@ void driver_remove_file(struct device_driver *drv, | |||
124 | EXPORT_SYMBOL_GPL(driver_remove_file); | 124 | EXPORT_SYMBOL_GPL(driver_remove_file); |
125 | 125 | ||
126 | /** | 126 | /** |
127 | * driver_add_kobj - add a kobject below the specified driver | ||
128 | * @drv: requesting device driver | ||
129 | * @kobj: kobject to add below this driver | ||
130 | * @fmt: format string that names the kobject | ||
131 | * | ||
132 | * You really don't want to do this, this is only here due to one looney | ||
133 | * iseries driver, go poke those developers if you are annoyed about | ||
134 | * this... | ||
135 | */ | ||
136 | int driver_add_kobj(struct device_driver *drv, struct kobject *kobj, | ||
137 | const char *fmt, ...) | ||
138 | { | ||
139 | va_list args; | ||
140 | char *name; | ||
141 | int ret; | ||
142 | |||
143 | va_start(args, fmt); | ||
144 | name = kvasprintf(GFP_KERNEL, fmt, args); | ||
145 | va_end(args); | ||
146 | |||
147 | if (!name) | ||
148 | return -ENOMEM; | ||
149 | |||
150 | ret = kobject_add(kobj, &drv->p->kobj, "%s", name); | ||
151 | kfree(name); | ||
152 | return ret; | ||
153 | } | ||
154 | EXPORT_SYMBOL_GPL(driver_add_kobj); | ||
155 | |||
156 | /** | ||
157 | * get_driver - increment driver reference count. | 127 | * get_driver - increment driver reference count. |
158 | * @drv: driver. | 128 | * @drv: driver. |
159 | */ | 129 | */ |
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, | |||
264 | extern void driver_remove_file(struct device_driver *driver, | 264 | extern void driver_remove_file(struct device_driver *driver, |
265 | const struct driver_attribute *attr); | 265 | const struct driver_attribute *attr); |
266 | 266 | ||
267 | extern int __must_check driver_add_kobj(struct device_driver *drv, | ||
268 | struct kobject *kobj, | ||
269 | const char *fmt, ...); | ||
270 | |||
271 | extern int __must_check driver_for_each_device(struct device_driver *drv, | 267 | extern int __must_check driver_for_each_device(struct device_driver *drv, |
272 | struct device *start, | 268 | struct device *start, |
273 | void *data, | 269 | void *data, |