driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices

[deliverable/linux.git] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 8e231d05b40058c6c3191b4a06a15ceff1714be3..1078969889fd799e185c42d742a1bb33927fa4dd 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -276,25 +276,6 @@ void class_destroy(struct class *cls)
        class_unregister(cls);
 }
 
-#ifdef CONFIG_SYSFS_DEPRECATED
-char *make_class_name(const char *name, struct kobject *kobj)
-{
-       char *class_name;
-       int size;
-
-       size = strlen(name) + strlen(kobject_name(kobj)) + 2;
-
-       class_name = kmalloc(size, GFP_KERNEL);
-       if (!class_name)
-               return NULL;
-
-       strcpy(class_name, name);
-       strcat(class_name, ":");
-       strcat(class_name, kobject_name(kobj));
-       return class_name;
-}
-#endif
-
 /**
  * class_dev_iter_init - initialize class device iterator
  * @iter: class iterator to initialize