Pull bugzilla-9345 into release branch

[linux-2.6] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index f6ebe6af3ef20229aa7a62a9083a35d2e988355d..a863bb091e11db26e6e996dfa6fb341285d11991 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -257,6 +257,22 @@ void class_device_remove_file(struct class_device * class_dev,
                sysfs_remove_file(&class_dev->kobj, &attr->attr);
 }
 
+int class_device_create_bin_file(struct class_device *class_dev,
+                                struct bin_attribute *attr)
+{
+       int error = -EINVAL;
+       if (class_dev)
+               error = sysfs_create_bin_file(&class_dev->kobj, attr);
+       return error;
+}
+
+void class_device_remove_bin_file(struct class_device *class_dev,
+                                 struct bin_attribute *attr)
+{
+       if (class_dev)
+               sysfs_remove_bin_file(&class_dev->kobj, attr);
+}
+
 static ssize_t
 class_device_attr_show(struct kobject * kobj, struct attribute * attr,
                       char * buf)
@@ -869,6 +885,8 @@ EXPORT_SYMBOL_GPL(class_device_create);
 EXPORT_SYMBOL_GPL(class_device_destroy);
 EXPORT_SYMBOL_GPL(class_device_create_file);
 EXPORT_SYMBOL_GPL(class_device_remove_file);
+EXPORT_SYMBOL_GPL(class_device_create_bin_file);
+EXPORT_SYMBOL_GPL(class_device_remove_bin_file);
 
 EXPORT_SYMBOL_GPL(class_interface_register);
 EXPORT_SYMBOL_GPL(class_interface_unregister);