d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kbdmux: simplify modevent handler

Browse Source 
In the event of a MOD_LOAD failure, MOD_UNLOAD will be invoked to unwind
module load. Most of the reversion in MOD_LOAD can just be deferred to
normal MOD_UNLOAD cleanup, rather than duplicating the effort.

A NULL return of kbd_get_switch in the MOD_UNLOAD handler has been
downgraded from a panic to a successful return, as that certainly just means
that kbd_add_driver failed (not possible at the moment) and we have no work
to do.
This commit is contained in:
Kyle Evans 2019-12-26 17:25:51 +00:00
parent 2899979df9
commit 94551ceb0a
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/kbdmux/kbdmux.c
View File

@ -1427,7 +1427,6 @@ kbdmux_modevent(module_t mod, int type, void *data)
break;
if ((sw = kbd_get_switch(KEYBOARD_NAME)) == NULL) {
kbd_delete_driver(&kbdmux_kbd_driver);
error = ENXIO;
break;
}
@ -1435,33 +1434,25 @@ kbdmux_modevent(module_t mod, int type, void *data)
kbd = NULL;
if ((error = (*sw->probe)(0, NULL, 0)) != 0 ||
(error = (*sw->init)(0, &kbd, NULL, 0)) != 0) {
kbd_delete_driver(&kbdmux_kbd_driver);
(error = (*sw->init)(0, &kbd, NULL, 0)) != 0)
break;
}
#ifdef KBD_INSTALL_CDEV
if ((error = kbd_attach(kbd)) != 0) {
(*sw->term)(kbd);
kbd_delete_driver(&kbdmux_kbd_driver);
break;
}
#endif
if ((error = (*sw->enable)(kbd)) != 0) {
(*sw->disable)(kbd);
#ifdef KBD_INSTALL_CDEV
kbd_detach(kbd);
#endif
(*sw->term)(kbd);
kbd_delete_driver(&kbdmux_kbd_driver);
if ((error = (*sw->enable)(kbd)) != 0)
break;
}
break;
case MOD_UNLOAD:
if ((sw = kbd_get_switch(KEYBOARD_NAME)) == NULL)
panic("kbd_get_switch(" KEYBOARD_NAME ") == NULL");
if ((sw = kbd_get_switch(KEYBOARD_NAME)) == NULL) {
error = 0;
break;
}
kbd = kbd_get_keyboard(kbd_find_keyboard(KEYBOARD_NAME, 0));
if (kbd != NULL) {
@ -1470,8 +1461,8 @@ kbdmux_modevent(module_t mod, int type, void *data)
kbd_detach(kbd);
#endif
(*sw->term)(kbd);
kbd_delete_driver(&kbdmux_kbd_driver);
}
kbd_delete_driver(&kbdmux_kbd_driver);
error = 0;
break;