svn commit: r355793 - in head/sys: arm/versatile dev/gpio dev/hyperv/input dev/usb/input

[Kyle Evans]

Author: kevans
Date: Mon Dec 16 01:37:03 2019
New Revision: 355793
URL: https://svnweb.freebsd.org/changeset/base/355793

Log:
  kbd drivers: use kbdd_* indirection for diag invocation
  
  These invocations were directly calling enkbd_diag(), rather than
  indirection back through kbdd_diag/kbdsw. While they're functionally
  equivent, invoking kbdd_diag where feasible (i.e. not in a diag
  implementation) makes it easier to visually identify locking needs in these
  other drivers.

Modified:
  head/sys/arm/versatile/pl050.c
  head/sys/dev/gpio/gpiokeys.c
  head/sys/dev/hyperv/input/hv_kbd.c
  head/sys/dev/usb/input/ukbd.c

Modified: head/sys/arm/versatile/pl050.c
==============================================================================
--- head/sys/arm/versatile/pl050.c	Mon Dec 16 01:27:14 2019	(r355792)
+++ head/sys/arm/versatile/pl050.c	Mon Dec 16 01:37:03 2019	(r355793)
@@ -717,7 +717,7 @@ pl050_kmi_attach(device_t dev)
 #endif
 
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 	kmi_attached = 1;
 	return (0);

Modified: head/sys/dev/gpio/gpiokeys.c
==============================================================================
--- head/sys/dev/gpio/gpiokeys.c	Mon Dec 16 01:27:14 2019	(r355792)
+++ head/sys/dev/gpio/gpiokeys.c	Mon Dec 16 01:37:03 2019	(r355793)
@@ -432,7 +432,7 @@ gpiokeys_attach(device_t dev)
 #endif
 
 	if (bootverbose) {
-		genkbd_diag(kbd, 1);
+		kbdd_diag(kbd, 1);
 	}
 
 	total_keys = 0;

Modified: head/sys/dev/hyperv/input/hv_kbd.c
==============================================================================
--- head/sys/dev/hyperv/input/hv_kbd.c	Mon Dec 16 01:27:14 2019	(r355792)
+++ head/sys/dev/hyperv/input/hv_kbd.c	Mon Dec 16 01:37:03 2019	(r355793)
@@ -535,7 +535,7 @@ hv_kbd_drv_attach(device_t dev)
 	}
 #endif
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 	return (0);
 detach:

Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c	Mon Dec 16 01:27:14 2019	(r355792)
+++ head/sys/dev/usb/input/ukbd.c	Mon Dec 16 01:37:03 2019	(r355793)
@@ -1369,7 +1369,7 @@ ukbd_attach(device_t dev)
 	sc->sc_flags |= UKBD_FLAG_ATTACHED;
 
 	if (bootverbose) {
-		genkbd_diag(kbd, bootverbose);
+		kbdd_diag(kbd, bootverbose);
 	}
 
 #ifdef USB_DEBUG