mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-20 00:26:39 +08:00
sysfs: make sysfs_addrm_finish() return void
With the previous sysfs_add_one() update, there is only one user of the return value of sysfs_addrm_finish() and the user can switch to testing @sd easily. Make sysfs_addrm_finish() return void for cleaner semantics as suggested by Satyam Sharma. This patch doesn't introduce any noticeable behavior change. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Satyam Sharma <satyam.sharma@gmail.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
23dc279950
commit
990e53f880
@ -609,11 +609,8 @@ static void sysfs_drop_dentry(struct sysfs_dirent *sd)
|
||||
*
|
||||
* LOCKING:
|
||||
* All mutexes acquired by sysfs_addrm_start() are released.
|
||||
*
|
||||
* RETURNS:
|
||||
* Number of added/removed sysfs_dirents since sysfs_addrm_start().
|
||||
*/
|
||||
int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
|
||||
void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
|
||||
{
|
||||
/* release resources acquired by sysfs_addrm_start() */
|
||||
mutex_unlock(&sysfs_mutex);
|
||||
@ -639,8 +636,6 @@ int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
|
||||
sysfs_deactivate(sd);
|
||||
sysfs_put(sd);
|
||||
}
|
||||
|
||||
return acxt->cnt;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -200,7 +200,10 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)
|
||||
if (sd)
|
||||
sysfs_remove_one(&acxt, sd);
|
||||
|
||||
if (sysfs_addrm_finish(&acxt))
|
||||
sysfs_addrm_finish(&acxt);
|
||||
|
||||
if (sd)
|
||||
return 0;
|
||||
return -ENOENT;
|
||||
else
|
||||
return -ENOENT;
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ extern int sysfs_add_one(struct sysfs_addrm_cxt *acxt,
|
||||
struct sysfs_dirent *sd);
|
||||
extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt,
|
||||
struct sysfs_dirent *sd);
|
||||
extern int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
|
||||
extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
|
||||
|
||||
extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd);
|
||||
extern void sysfs_instantiate(struct dentry *dentry, struct inode *inode);
|
||||
|
Loading…
Reference in New Issue
Block a user