sysfs: remove useless test from sysfs_merge_group
authorAlan Stern <stern@rowland.harvard.edu>
Mon, 15 Nov 2010 20:46:07 +0000 (15:46 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Nov 2010 19:59:53 +0000 (11:59 -0800)
commite030d58e8860f1c87b17631dbdd70747cbe1fb5b
tree5eca982d7e71086db7e743eb575da019790b89bb
parent6b6e39a6a8da7234c538d14c43d3583da8875f9c
sysfs: remove useless test from sysfs_merge_group

Dan Carpenter pointed out that the new sysfs_merge_group() and
sysfs_unmerge_group() routines requires their grp argument to be
non-NULL, because they dereference grp to obtain the list of
attributes.  Hence it's pointless for the routines to include a test
and special-case handling for when grp is NULL.  This patch (as1433)
removes the unneeded tests.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/sysfs/group.c