From owner-svn-src-all@freebsd.org Thu May 12 20:15:24 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA468B39458; Thu, 12 May 2016 20:15:24 +0000 (UTC) (envelope-from gonzo@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 mx1.freebsd.org (Postfix) with ESMTPS id 71AFD1F8E; Thu, 12 May 2016 20:15:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4CKFNRR041114; Thu, 12 May 2016 20:15:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4CKFNdj041113; Thu, 12 May 2016 20:15:23 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201605122015.u4CKFNdj041113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Thu, 12 May 2016 20:15:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299566 - head/sys/dev/gpio X-SVN-Group: head 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.22 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, 12 May 2016 20:15:24 -0000 Author: gonzo Date: Thu May 12 20:15:23 2016 New Revision: 299566 URL: https://svnweb.freebsd.org/changeset/base/299566 Log: Fix detach routine for gpiokeys - Release pin only when all per=key callouts are stopped - Unregister keyboard when detaching device node Modified: head/sys/dev/gpio/gpiokeys.c Modified: head/sys/dev/gpio/gpiokeys.c ============================================================================== --- head/sys/dev/gpio/gpiokeys.c Thu May 12 20:14:44 2016 (r299565) +++ head/sys/dev/gpio/gpiokeys.c Thu May 12 20:15:23 2016 (r299566) @@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include #include +#define KBD_DRIVER_NAME "gpiokeys" + #define GPIOKEYS_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define GPIOKEYS_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define GPIOKEYS_LOCK_INIT(_sc) \ @@ -357,12 +359,12 @@ gpiokeys_detach_key(struct gpiokeys_soft if (key->irq_res) bus_release_resource(sc->sc_dev, SYS_RES_IRQ, key->irq_rid, key->irq_res); - if (key->pin) - gpio_pin_release(key->pin); if (callout_pending(&key->repeat_callout)) callout_drain(&key->repeat_callout); if (callout_pending(&key->debounce_callout)) callout_drain(&key->debounce_callout); + if (key->pin) + gpio_pin_release(key->pin); GPIOKEY_UNLOCK(key); GPIOKEY_LOCK_DESTROY(key); @@ -397,7 +399,7 @@ gpiokeys_attach(device_t dev) GPIOKEYS_LOCK_INIT(sc); unit = device_get_unit(dev); - kbd_init_struct(kbd, "gpiokeys", KB_OTHER, unit, 0, 0, 0); + kbd_init_struct(kbd, KBD_DRIVER_NAME, KB_OTHER, unit, 0, 0, 0); kbd->kb_data = (void *)sc; sc->sc_mode = K_XLATE; @@ -468,6 +470,7 @@ static int gpiokeys_detach(device_t dev) { struct gpiokeys_softc *sc; + keyboard_t *kbd; int i; sc = device_get_softc(dev); @@ -475,6 +478,14 @@ gpiokeys_detach(device_t dev) for (i = 0; i < sc->sc_total_keys; i++) gpiokeys_detach_key(sc, &sc->sc_keys[i]); + kbd = kbd_get_keyboard(kbd_find_keyboard(KBD_DRIVER_NAME, + device_get_unit(dev))); + +#ifdef KBD_INSTALL_CDEV + kbd_detach(kbd); +#endif + kbd_unregister(kbd); + GPIOKEYS_LOCK_DESTROY(sc); if (sc->sc_keys) free(sc->sc_keys, M_DEVBUF);