mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 00:51:51 -04:00
Merge tag 'counter-updates-for-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next
William writes: Counter updates for 7.1 A cleanup patch for sysfs to remove a superfluous return statement in counter_sysfs_attr_add() that was unintentionally left during an earlier refactor. * tag 'counter-updates-for-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter: counter: sysfs: remove double return in counter_sysfs_attr_add()
This commit is contained in:
@@ -1101,8 +1101,6 @@ static int counter_sysfs_attr_add(struct counter_device *const counter,
|
||||
/* Add device extensions */
|
||||
return counter_sysfs_exts_add(dev, cattr_group, counter->ext,
|
||||
counter->num_ext, scope, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user