From owner-svn-src-all@freebsd.org Thu Dec 26 17:25:52 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9013D1D5687; Thu, 26 Dec 2019 17:25:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47kH0w326rz48s7; Thu, 26 Dec 2019 17:25:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EC114050; Thu, 26 Dec 2019 17:25:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBQHPqbn076461; Thu, 26 Dec 2019 17:25:52 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBQHPq8u076460; Thu, 26 Dec 2019 17:25:52 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201912261725.xBQHPq8u076460@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 26 Dec 2019 17:25:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356092 - head/sys/dev/kbdmux X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/dev/kbdmux X-SVN-Commit-Revision: 356092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Dec 2019 17:25:52 -0000 Author: kevans Date: Thu Dec 26 17:25:51 2019 New Revision: 356092 URL: https://svnweb.freebsd.org/changeset/base/356092 Log: kbdmux: simplify modevent handler 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. Modified: head/sys/dev/kbdmux/kbdmux.c Modified: head/sys/dev/kbdmux/kbdmux.c ============================================================================== --- head/sys/dev/kbdmux/kbdmux.c Thu Dec 26 17:09:36 2019 (r356091) +++ head/sys/dev/kbdmux/kbdmux.c Thu Dec 26 17:25:51 2019 (r356092) @@ -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;