Revert "Driver core: remove class_device_*_bin_file"

This reverts commit fcd239d3d5575e5cc63aab5c33cf6dc66904f6d6.

I messed up, ia64 still uses these files in the current tree, and now
can not build the pci code, which all ia64 boxes seem to require :)

This fixes that mistake.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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);

diff --git a/include/linux/device.h b/include/linux/device.h
index 2c5e49d446b853a5fb0856e1d771f32cbc207809..2e15822fe40931cb88eb627971f1a5db41f9c892 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -291,6 +291,10 @@ extern void class_device_put(struct class_device *);
 
 extern void class_device_remove_file(struct class_device *, 
                                     const struct class_device_attribute *);
+extern int __must_check class_device_create_bin_file(struct class_device *,
+                                       struct bin_attribute *);
+extern void class_device_remove_bin_file(struct class_device *,
+                                        struct bin_attribute *);
 
 struct class_interface {
        struct list_head        node;