aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-31 15:51:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-31 15:51:29 -0400
commitd919fd433b5823d1cf9d0688eb2eec183de9b74c (patch)
tree037cac29c344e0a2009a241d2168825f399b600a
parent5307cc1aa53850f017c8053db034cf950b670ac9 (diff)
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.c18
-rw-r--r--include/linux/device.h4
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index f6ebe6af3ef2..a863bb091e11 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,
257 sysfs_remove_file(&class_dev->kobj, &attr->attr); 257 sysfs_remove_file(&class_dev->kobj, &attr->attr);
258} 258}
259 259
260int class_device_create_bin_file(struct class_device *class_dev,
261 struct bin_attribute *attr)
262{
263 int error = -EINVAL;
264 if (class_dev)
265 error = sysfs_create_bin_file(&class_dev->kobj, attr);
266 return error;
267}
268
269void class_device_remove_bin_file(struct class_device *class_dev,
270 struct bin_attribute *attr)
271{
272 if (class_dev)
273 sysfs_remove_bin_file(&class_dev->kobj, attr);
274}
275
260static ssize_t 276static ssize_t
261class_device_attr_show(struct kobject * kobj, struct attribute * attr, 277class_device_attr_show(struct kobject * kobj, struct attribute * attr,
262 char * buf) 278 char * buf)
@@ -869,6 +885,8 @@ EXPORT_SYMBOL_GPL(class_device_create);
869EXPORT_SYMBOL_GPL(class_device_destroy); 885EXPORT_SYMBOL_GPL(class_device_destroy);
870EXPORT_SYMBOL_GPL(class_device_create_file); 886EXPORT_SYMBOL_GPL(class_device_create_file);
871EXPORT_SYMBOL_GPL(class_device_remove_file); 887EXPORT_SYMBOL_GPL(class_device_remove_file);
888EXPORT_SYMBOL_GPL(class_device_create_bin_file);
889EXPORT_SYMBOL_GPL(class_device_remove_bin_file);
872 890
873EXPORT_SYMBOL_GPL(class_interface_register); 891EXPORT_SYMBOL_GPL(class_interface_register);
874EXPORT_SYMBOL_GPL(class_interface_unregister); 892EXPORT_SYMBOL_GPL(class_interface_unregister);
diff --git a/include/linux/device.h b/include/linux/device.h
index 2c5e49d446b8..2e15822fe409 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -291,6 +291,10 @@ extern void class_device_put(struct class_device *);
291 291
292extern void class_device_remove_file(struct class_device *, 292extern void class_device_remove_file(struct class_device *,
293 const struct class_device_attribute *); 293 const struct class_device_attribute *);
294extern int __must_check class_device_create_bin_file(struct class_device *,
295 struct bin_attribute *);
296extern void class_device_remove_bin_file(struct class_device *,
297 struct bin_attribute *);
294 298
295struct class_interface { 299struct class_interface {
296 struct list_head node; 300 struct list_head node;