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

Commit 66ecb92b authored by Phil Carmody's avatar Phil Carmody Committed by Greg Kroah-Hartman
Browse files

Driver core: bin_attribute parameters can often be const* 



Many struct bin_attribute descriptors are purely read-only
structures, and there's no need to change them. Therefore
make the promise not to, which will let those descriptors
be put in a ro section.

Signed-off-by: default avatarPhil Carmody <ext-phil.2.carmody@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 26579ab7

drivers/base/core.c

+4 −2
Original line number Diff line number Diff line
@@ -472,7 +472,8 @@ void device_remove_file(struct device *dev, 
 * @dev: device.

 * @attr: device binary attribute descriptor.

 */

int device_create_bin_file(struct device *dev, struct bin_attribute *attr)

int device_create_bin_file(struct device *dev,

			   const struct bin_attribute *attr)

{

	int error = -EINVAL;

	if (dev)
@@ -486,7 +487,8 @@ EXPORT_SYMBOL_GPL(device_create_bin_file); 
 * @dev: device.

 * @attr: device binary attribute descriptor.

 */

void device_remove_bin_file(struct device *dev, struct bin_attribute *attr)

void device_remove_bin_file(struct device *dev,

			    const struct bin_attribute *attr)

{

	if (dev)

		sysfs_remove_bin_file(&dev->kobj, attr);

fs/sysfs/bin.c

+4 −2
Original line number Diff line number Diff line
@@ -483,7 +483,8 @@ void unmap_bin_file(struct sysfs_dirent *attr_sd) 
 *	@attr:	attribute descriptor.

 */



int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)

int sysfs_create_bin_file(struct kobject *kobj,

			  const struct bin_attribute *attr)

{

	BUG_ON(!kobj || !kobj->sd || !attr);
@@ -497,7 +498,8 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr) 
 *	@attr:	attribute descriptor.

 */



void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)

void sysfs_remove_bin_file(struct kobject *kobj,

			   const struct bin_attribute *attr)

{

	sysfs_hash_and_remove(kobj->sd, attr->attr.name);

}

include/linux/device.h

+3 −3
Original line number Diff line number Diff line
@@ -323,9 +323,9 @@ extern int __must_check device_create_file(struct device *device, 
extern void device_remove_file(struct device *dev,

			       const struct device_attribute *attr);

extern int __must_check device_create_bin_file(struct device *dev,

					       struct bin_attribute *attr);

					const struct bin_attribute *attr);

extern void device_remove_bin_file(struct device *dev,

				   struct bin_attribute *attr);

				   const struct bin_attribute *attr);

extern int device_schedule_callback_owner(struct device *dev,

		void (*func)(struct device *dev), struct module *owner);

include/linux/sysfs.h

+5 −4
Original line number Diff line number Diff line
@@ -99,8 +99,9 @@ int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, 
void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);



int __must_check sysfs_create_bin_file(struct kobject *kobj,

				       struct bin_attribute *attr);

void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr);

				       const struct bin_attribute *attr);

void sysfs_remove_bin_file(struct kobject *kobj,

			   const struct bin_attribute *attr);



int __must_check sysfs_create_link(struct kobject *kobj, struct kobject *target,

				   const char *name);
@@ -175,13 +176,13 @@ static inline void sysfs_remove_file(struct kobject *kobj, 
}



static inline int sysfs_create_bin_file(struct kobject *kobj,

					struct bin_attribute *attr)

					const struct bin_attribute *attr)

{

	return 0;

}



static inline void sysfs_remove_bin_file(struct kobject *kobj,

					 struct bin_attribute *attr)

					 const struct bin_attribute *attr)

{

}