diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-31 12:51:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-31 12:51:29 -0700 |
| commit | d919fd433b5823d1cf9d0688eb2eec183de9b74c (patch) | |
| tree | 037cac29c344e0a2009a241d2168825f399b600a | |
| parent | 5307cc1aa53850f017c8053db034cf950b670ac9 (diff) | |
| download | kernel_goldelico_gta04-d919fd433b5823d1cf9d0688eb2eec183de9b74c.zip kernel_goldelico_gta04-d919fd433b5823d1cf9d0688eb2eec183de9b74c.tar.gz kernel_goldelico_gta04-d919fd433b5823d1cf9d0688eb2eec183de9b74c.tar.bz2 | |
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>
| -rw-r--r-- | drivers/base/class.c | 18 | ||||
| -rw-r--r-- | include/linux/device.h | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index f6ebe6a..a863bb0 100644 --- 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 2c5e49d..2e15822 100644 --- 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; |