Commit a1ed2cbb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-updates-for-7.1' of... 

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()
parents 0a18c3bc cbf8db23

drivers/counter/counter-sysfs.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}



/**