From owner-svn-src-all@freebsd.org Tue Sep 1 21:41:40 2020 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 2C97E37B1BB; Tue, 1 Sep 2020 21:41:40 +0000 (UTC) (envelope-from mjg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bh0rh06kpz4QQs; Tue, 1 Sep 2020 21:41:40 +0000 (UTC) (envelope-from mjg@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 DB77620143; Tue, 1 Sep 2020 21:41:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lfdc0035613; Tue, 1 Sep 2020 21:41:39 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lfd9B035609; Tue, 1 Sep 2020 21:41:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012141.081Lfd9B035609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365117 - head/sys/dev/atkbdc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/atkbdc X-SVN-Commit-Revision: 365117 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.33 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: Tue, 01 Sep 2020 21:41:40 -0000 Author: mjg Date: Tue Sep 1 21:41:38 2020 New Revision: 365117 URL: https://svnweb.freebsd.org/changeset/base/365117 Log: atkbdc: clean up empty lines in .c and .h files Modified: head/sys/dev/atkbdc/atkbd.c head/sys/dev/atkbdc/atkbdc.c head/sys/dev/atkbdc/atkbdc_isa.c head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/atkbd.c ============================================================================== --- head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:38 2020 (r365117) @@ -314,7 +314,7 @@ atkbd_configure(int flags) } return 0; } - + /* XXX: a kludge to obtain the device configuration flags */ if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0) flags |= i; @@ -427,7 +427,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int imin(fkeymap_size * sizeof(fkeymap[0]), sizeof(fkey_tab))); kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size); kbd->kb_data = (void *)state; - + if (probe_keyboard(state->kbdc, flags)) { /* shouldn't happen */ if (flags & KB_CONF_FAIL_IF_NO_KBD) { error = ENXIO; @@ -928,7 +928,6 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) s = spltty(); switch (cmd) { - case KDGKBMODE: /* get keyboard mode */ *(int *)arg = state->ks_mode; break; @@ -1386,7 +1385,7 @@ init_keyboard(KBDC kbdc, int *type, int flags) if (bootverbose) printf("atkbd: scancode set %d\n", codeset); #endif /* KBD_DETECT_XT_KEYBOARD */ - + *type = KB_OTHER; id = get_kbd_id(kbdc); switch(id) { Modified: head/sys/dev/atkbdc/atkbdc.c ============================================================================== --- head/sys/dev/atkbdc/atkbdc.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbdc.c Tue Sep 1 21:41:38 2020 (r365117) @@ -116,7 +116,6 @@ static struct atkbdc_quirks quirks[] = { {"coreboot", NULL, NULL, KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT | KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT}, - {NULL, NULL, NULL, 0} }; Modified: head/sys/dev/atkbdc/atkbdc_isa.c ============================================================================== --- head/sys/dev/atkbdc/atkbdc_isa.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbdc_isa.c Tue Sep 1 21:41:38 2020 (r365117) @@ -77,7 +77,6 @@ static device_method_t atkbdc_isa_methods[] = { DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; @@ -300,7 +299,7 @@ atkbdc_isa_alloc_resource(device_t dev, device_t child rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { atkbdc_softc_t *sc; - + sc = *(atkbdc_softc_t **)device_get_softc(dev); if (type == SYS_RES_IRQ && *rid == KBDC_RID_KBD && sc->irq != NULL) return (sc->irq); @@ -313,7 +312,7 @@ atkbdc_isa_release_resource(device_t dev, device_t chi struct resource *r) { atkbdc_softc_t *sc; - + sc = *(atkbdc_softc_t **)device_get_softc(dev); if (type == SYS_RES_IRQ && rid == KBDC_RID_KBD && r == sc->irq) return (0); Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:38 2020 (r365117) @@ -727,7 +727,6 @@ static device_method_t psm_methods[] = { DEVMETHOD(device_attach, psmattach), DEVMETHOD(device_detach, psmdetach), DEVMETHOD(device_resume, psmresume), - { 0, 0 } }; @@ -1691,7 +1690,6 @@ psmprobe(device_t dev) #define PS2_MOUSE_ELANTECH_NAME "ETPS/2 Elantech Touchpad" #define PS2_MOUSE_ELANTECH_ST_NAME "ETPS/2 Elantech TrackPoint" #define PS2_MOUSE_ELANTECH_PRODUCT 0x000E - #define ABSINFO_END { ABS_CNT, 0, 0, 0 } static void @@ -2629,7 +2627,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, i /* Perform IOCTL command */ switch (cmd) { - case OLD_MOUSE_GETHWINFO: s = spltty(); ((old_mousehw_t *)addr)->buttons = sc->hw.buttons; @@ -4716,7 +4713,6 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, m !(pb->ipacket[0] & 0x10) != !(pb->ipacket[3] & 0x10) && !(pb->ipacket[0] & 0x20) != !(pb->ipacket[2] & 0x80) && !(pb->ipacket[0] & 0x20) != !(pb->ipacket[3] & 0x20)) { - *x = (pb->ipacket[0] & MOUSE_PS2_XNEG) ? pb->ipacket[4] - 256 : pb->ipacket[4]; *y = (pb->ipacket[0] & MOUSE_PS2_YNEG) ? @@ -4982,7 +4978,6 @@ psmsoftintr(void *arg) sc->idlepacket.inputbytes = 0; switch (sc->hw.model) { - case MOUSE_MODEL_EXPLORER: /* * b7 b6 b5 b4 b3 b2 b1 b0 @@ -7489,7 +7484,6 @@ static device_attach_t psmcpnp_attach; static device_method_t psmcpnp_methods[] = { DEVMETHOD(device_probe, psmcpnp_probe), DEVMETHOD(device_attach, psmcpnp_attach), - { 0, 0 } };