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

Commit 69d44ffb authored by Alan Stern's avatar Alan Stern Committed by Rafael J. Wysocki
Browse files

sysfs: Add sysfs_merge_group() and sysfs_unmerge_group() 



This patch (as1420) adds sysfs_merge_group() and sysfs_unmerge_group()
functions, allowing drivers easily to add and remove sets of
attributes to a pre-existing attribute group directory.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 098dff73

fs/sysfs/group.c

+59 −0
Original line number Diff line number Diff line
@@ -148,6 +148,65 @@ void sysfs_remove_group(struct kobject * kobj, 
	sysfs_put(sd);

}



/**

 * sysfs_merge_group - merge files into a pre-existing attribute group.

 * @kobj:	The kobject containing the group.

 * @grp:	The files to create and the attribute group they belong to.

 *

 * This function returns an error if the group doesn't exist or any of the

 * files already exist in that group, in which case none of the new files

 * are created.

 */

int sysfs_merge_group(struct kobject *kobj,

		       const struct attribute_group *grp)

{

	struct sysfs_dirent *dir_sd;

	int error = 0;

	struct attribute *const *attr;

	int i;



	if (grp)

		dir_sd = sysfs_get_dirent(kobj->sd, NULL, grp->name);

	else

		dir_sd = sysfs_get(kobj->sd);

	if (!dir_sd)

		return -ENOENT;



	for ((i = 0, attr = grp->attrs); *attr && !error; (++i, ++attr))

		error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);

	if (error) {

		while (--i >= 0)

			sysfs_hash_and_remove(dir_sd, NULL, (*--attr)->name);

	}

	sysfs_put(dir_sd);



	return error;

}

EXPORT_SYMBOL_GPL(sysfs_merge_group);



/**

 * sysfs_unmerge_group - remove files from a pre-existing attribute group.

 * @kobj:	The kobject containing the group.

 * @grp:	The files to remove and the attribute group they belong to.

 */

void sysfs_unmerge_group(struct kobject *kobj,

		       const struct attribute_group *grp)

{

	struct sysfs_dirent *dir_sd;

	struct attribute *const *attr;



	if (grp)

		dir_sd = sysfs_get_dirent(kobj->sd, NULL, grp->name);

	else

		dir_sd = sysfs_get(kobj->sd);

	if (dir_sd) {

		for (attr = grp->attrs; *attr; ++attr)

			sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);

		sysfs_put(dir_sd);

	}

}

EXPORT_SYMBOL_GPL(sysfs_unmerge_group);





EXPORT_SYMBOL_GPL(sysfs_create_group);

EXPORT_SYMBOL_GPL(sysfs_update_group);

include/linux/sysfs.h

+15 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ int sysfs_add_file_to_group(struct kobject *kobj, 
			const struct attribute *attr, const char *group);

void sysfs_remove_file_from_group(struct kobject *kobj,

			const struct attribute *attr, const char *group);

int sysfs_merge_group(struct kobject *kobj,

		       const struct attribute_group *grp);

void sysfs_unmerge_group(struct kobject *kobj,

		       const struct attribute_group *grp);



void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);

void sysfs_notify_dirent(struct sysfs_dirent *sd);
@@ -302,6 +306,17 @@ static inline void sysfs_remove_file_from_group(struct kobject *kobj, 
{

}



static inline int sysfs_merge_group(struct kobject *kobj,

		       const struct attribute_group *grp)

{

	return 0;

}



static inline void sysfs_unmerge_group(struct kobject *kobj,

		       const struct attribute_group *grp)

{

}



static inline void sysfs_notify(struct kobject *kobj, const char *dir,

				const char *attr)

{