diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2010-09-05 01:33:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:16:43 -0400 |
commit | 39aba963d937edb20db7d9d93e6dda5d2adfdcdd (patch) | |
tree | 7aa1898634ed6f6ece3e48f4b5464fcbcb4f49a5 /drivers/base/class.c | |
parent | 807508c8ff9af6ce8f25c5ca5f3eb06a8e7d3286 (diff) |
driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices
This patch removes the old CONFIG_SYSFS_DEPRECATED_V2 config option,
but it keeps the logic around to handle block devices in the old manner
as some people like to run new kernel versions on old (pre 2007/2008)
distros.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: "James E.J. Bottomley" <James.Bottomley@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r-- | drivers/base/class.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index 8e231d05b400..1078969889fd 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
@@ -276,25 +276,6 @@ void class_destroy(struct class *cls) | |||
276 | class_unregister(cls); | 276 | class_unregister(cls); |
277 | } | 277 | } |
278 | 278 | ||
279 | #ifdef CONFIG_SYSFS_DEPRECATED | ||
280 | char *make_class_name(const char *name, struct kobject *kobj) | ||
281 | { | ||
282 | char *class_name; | ||
283 | int size; | ||
284 | |||
285 | size = strlen(name) + strlen(kobject_name(kobj)) + 2; | ||
286 | |||
287 | class_name = kmalloc(size, GFP_KERNEL); | ||
288 | if (!class_name) | ||
289 | return NULL; | ||
290 | |||
291 | strcpy(class_name, name); | ||
292 | strcat(class_name, ":"); | ||
293 | strcat(class_name, kobject_name(kobj)); | ||
294 | return class_name; | ||
295 | } | ||
296 | #endif | ||
297 | |||
298 | /** | 279 | /** |
299 | * class_dev_iter_init - initialize class device iterator | 280 | * class_dev_iter_init - initialize class device iterator |
300 | * @iter: class iterator to initialize | 281 | * @iter: class iterator to initialize |