Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d08ac0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: remove class_device_*_bin_file"
parents 57eb06e5 d919fd43

drivers/base/class.c

+18 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/device.h

+4 −0
Original line number Diff line number Diff line
@@ -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;