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

Commit e3a15db2 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[PATCH] sysfs_{create|remove}_link should take const char * 



sysfs: make sysfs_{create|remove}_link to take const char * name.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eb11d8ff

fs/sysfs/symlink.c

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void fill_object_path(struct kobject * kobj, char * buffer, int length) 
	}

}



static int sysfs_add_link(struct dentry * parent, char * name, struct kobject * target)

static int sysfs_add_link(struct dentry * parent, const char * name, struct kobject * target)

{

	struct sysfs_dirent * parent_sd = parent->d_fsdata;

	struct sysfs_symlink * sl;
@@ -79,7 +79,7 @@ exit1: 
 *	@target:	object we're pointing to.

 *	@name:		name of the symlink.

 */

int sysfs_create_link(struct kobject * kobj, struct kobject * target, char * name)

int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name)

{

	struct dentry * dentry = kobj->dentry;

	int error = 0;
@@ -99,7 +99,7 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, char * nam 
 *	@name:	name of the symlink to remove.

 */



void sysfs_remove_link(struct kobject * kobj, char * name)

void sysfs_remove_link(struct kobject * kobj, const char * name)

{

	sysfs_hash_and_remove(kobj->dentry,name);

}

include/linux/sysfs.h

+5 −5
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ extern void 
sysfs_remove_file(struct kobject *, const struct attribute *);



extern int

sysfs_create_link(struct kobject * kobj, struct kobject * target, char * name);

sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name);



extern void

sysfs_remove_link(struct kobject *, char * name);

sysfs_remove_link(struct kobject *, const char * name);



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

int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
@@ -153,12 +153,12 @@ static inline void sysfs_remove_file(struct kobject * k, const struct attribute 
	;

}



static inline int sysfs_create_link(struct kobject * k, struct kobject * t, char * n)

static inline int sysfs_create_link(struct kobject * k, struct kobject * t, const char * n)

{

	return 0;

}



static inline void sysfs_remove_link(struct kobject * k, char * name)

static inline void sysfs_remove_link(struct kobject * k, const char * name)

{

	;

}