Merge tag 'counter-updates-for-6.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next

gregkh · gregkh · commit 2399cde86e0f · 2023-10-20T08:34:47.000+02:00
William writes:

First set of Counter updates for the 6.7 cycle

A minor typographical error is fixed in the description comment block
for struct counter_component.

* tag 'counter-updates-for-6.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: chrdev: remove a typo in header file comment
diff --git a/include/uapi/linux/counter.h b/include/uapi/linux/counter.h
@@ -38,7 +38,7 @@ enum counter_scope {
  *
  * For example, if the Count 2 ceiling extension of Counter device 4 is desired,
  * set type equal to COUNTER_COMPONENT_EXTENSION, scope equal to
- * COUNTER_COUNT_SCOPE, parent equal to 2, and id equal to the value provided by
+ * COUNTER_SCOPE_COUNT, parent equal to 2, and id equal to the value provided by
  * the respective /sys/bus/counter/devices/counter4/count2/ceiling_component_id
  * sysfs attribute.
  */

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ enum counter_scope {`
`38`	`38`	`*`
`39`	`39`	`* For example, if the Count 2 ceiling extension of Counter device 4 is desired,`
`40`	`40`	`* set type equal to COUNTER_COMPONENT_EXTENSION, scope equal to`
`41`		`- * COUNTER_COUNT_SCOPE, parent equal to 2, and id equal to the value provided by`
	`41`	`+ * COUNTER_SCOPE_COUNT, parent equal to 2, and id equal to the value provided by`
`42`	`42`	`* the respective /sys/bus/counter/devices/counter4/count2/ceiling_component_id`
`43`	`43`	`* sysfs attribute.`
`44`	`44`	`*/`