From owner-svn-src-all@FreeBSD.ORG Wed Oct 13 11:37:12 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8FEB1065674; Wed, 13 Oct 2010 11:37:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 95D338FC0C; Wed, 13 Oct 2010 11:37:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DBbCvl086191; Wed, 13 Oct 2010 11:37:12 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DBbCPg086187; Wed, 13 Oct 2010 11:37:12 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201010131137.o9DBbCPg086187@svn.freebsd.org> From: Rui Paulo Date: Wed, 13 Oct 2010 11:37:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213770 - in head/sys/dev: kbd kbdmux syscons X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Oct 2010 11:37:12 -0000 Author: rpaulo Date: Wed Oct 13 11:37:12 2010 New Revision: 213770 URL: http://svn.freebsd.org/changeset/base/213770 Log: Explicitly tell the compiler that we don't care about the return value of kbdd_ioctl(). Modified: head/sys/dev/kbd/kbd.c head/sys/dev/kbdmux/kbdmux.c head/sys/dev/syscons/syscons.c Modified: head/sys/dev/kbd/kbd.c ============================================================================== --- head/sys/dev/kbd/kbd.c Wed Oct 13 11:35:59 2010 (r213769) +++ head/sys/dev/kbd/kbd.c Wed Oct 13 11:37:12 2010 (r213770) @@ -224,7 +224,7 @@ kbd_register(keyboard_t *kbd) strcpy(ki.kb_name, kbd->kb_name); ki.kb_unit = kbd->kb_unit; - kbdd_ioctl(mux, KBADDKBD, (caddr_t) &ki); + (void)kbdd_ioctl(mux, KBADDKBD, (caddr_t) &ki); } return (index); @@ -241,7 +241,7 @@ kbd_register(keyboard_t *kbd) strcpy(ki.kb_name, kbd->kb_name); ki.kb_unit = kbd->kb_unit; - kbdd_ioctl(mux, KBADDKBD, (caddr_t) &ki); + (void)kbdd_ioctl(mux, KBADDKBD, (caddr_t) &ki); } return (index); @@ -1148,7 +1148,7 @@ genkbd_diag(keyboard_t *kbd, int level) (s) |= l ## DOWN; \ (s) ^= l ## ED; \ i = (s) & LOCK_MASK; \ - kbdd_ioctl((k), KDSETLED, (caddr_t)&i); \ + (void)kbdd_ioctl((k), KDSETLED, (caddr_t)&i); \ } static u_int @@ -1308,7 +1308,7 @@ genkbd_keyaction(keyboard_t *kbd, int ke #else state &= ~CLKED; i = state & LOCK_MASK; - kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i); + (void)kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i); #endif break; case SLK: @@ -1344,7 +1344,7 @@ genkbd_keyaction(keyboard_t *kbd, int ke #else state |= CLKED; i = state & LOCK_MASK; - kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i); + (void)kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i); #endif break; case SLK: Modified: head/sys/dev/kbdmux/kbdmux.c ============================================================================== --- head/sys/dev/kbdmux/kbdmux.c Wed Oct 13 11:35:59 2010 (r213769) +++ head/sys/dev/kbdmux/kbdmux.c Wed Oct 13 11:37:12 2010 (r213770) @@ -1115,7 +1115,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd /* KDSETLED on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) - kbdd_ioctl(k->kbd, KDSETLED, arg); + (void)kbdd_ioctl(k->kbd, KDSETLED, arg); KBDMUX_UNLOCK(state); break; @@ -1146,7 +1146,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd /* KDSKBSTATE on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) - kbdd_ioctl(k->kbd, KDSKBSTATE, arg); + (void)kbdd_ioctl(k->kbd, KDSKBSTATE, arg); KBDMUX_UNLOCK(state); @@ -1192,7 +1192,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd /* perform command on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) - kbdd_ioctl(k->kbd, cmd, arg); + (void)kbdd_ioctl(k->kbd, cmd, arg); KBDMUX_UNLOCK(state); break; @@ -1205,7 +1205,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd /* perform command on all slave keyboards */ SLIST_FOREACH(k, &state->ks_kbds, next) - kbdd_ioctl(k->kbd, cmd, arg); + (void)kbdd_ioctl(k->kbd, cmd, arg); KBDMUX_UNLOCK(state); /* FALLTHROUGH */ Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Wed Oct 13 11:35:59 2010 (r213769) +++ head/sys/dev/syscons/syscons.c Wed Oct 13 11:37:12 2010 (r213770) @@ -475,7 +475,7 @@ sc_attach_unit(int unit, int flags) scrn_timer(sc); /* set up the keyboard */ - kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); update_kbd_state(scp, scp->status, LOCK_MASK); printf("%s%d: %s <%d virtual consoles, flags=0x%x>\n", @@ -584,7 +584,7 @@ sctty_open(struct tty *tp) #ifndef __sparc64__ if (sc->kbd != NULL) { key.keynum = KEYCODE_BS; - kbdd_ioctl(sc->kbd, GIO_KEYMAPENT, (caddr_t)&key); + (void)kbdd_ioctl(sc->kbd, GIO_KEYMAPENT, (caddr_t)&key); tp->t_termios.c_cc[VERASE] = key.key.map[0]; } #endif @@ -643,7 +643,7 @@ sctty_close(struct tty *tp) #endif scp->kbd_mode = K_XLATE; if (scp == scp->sc->cur_scp) - kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); + (void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); DPRINTF(5, ("done.\n")); } } @@ -1222,7 +1222,7 @@ sctty_ioctl(struct tty *tp, u_long cmd, case K_CODE: /* switch to CODE mode */ scp->kbd_mode = *(int *)data; if (scp == sc->cur_scp) - kbdd_ioctl(sc->kbd, KDSKBMODE, data); + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, data); return 0; default: return EINVAL; @@ -1336,7 +1336,7 @@ sctty_ioctl(struct tty *tp, u_long cmd, } sc->kbd = kbd_get_keyboard(i); /* sc->kbd == newkbd */ sc->keyboard = i; - kbdd_ioctl(sc->kbd, KDSKBMODE, + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&sc->cur_scp->kbd_mode); update_kbd_state(sc->cur_scp, sc->cur_scp->status, LOCK_MASK); @@ -1649,14 +1649,14 @@ sc_cngetc(struct consdev *cd) /* we shall always use the keyboard in the XLATE mode here */ cur_mode = scp->kbd_mode; scp->kbd_mode = K_XLATE; - kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); + (void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); kbdd_poll(scp->sc->kbd, TRUE); c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK); kbdd_poll(scp->sc->kbd, FALSE); scp->kbd_mode = cur_mode; - kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); + (void)kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); kbdd_disable(scp->sc->kbd); splx(s); @@ -1756,7 +1756,7 @@ scrn_timer(void *arg) sc->keyboard = sc_allocate_keyboard(sc, -1); if (sc->keyboard >= 0) { sc->kbd = kbd_get_keyboard(sc->keyboard); - kbdd_ioctl(sc->kbd, KDSKBMODE, + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&sc->cur_scp->kbd_mode); update_kbd_state(sc->cur_scp, sc->cur_scp->status, LOCK_MASK); @@ -2551,7 +2551,7 @@ exchange_scr(sc_softc_t *sc) /* set up the keyboard for the new screen */ if (sc->old_scp->kbd_mode != scp->kbd_mode) - kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); + (void)kbdd_ioctl(sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); update_kbd_state(scp, scp->status, LOCK_MASK); mark_all(scp); @@ -3334,7 +3334,7 @@ next_code: case NLK: case CLK: case ALK: break; case SLK: - kbdd_ioctl(sc->kbd, KDGKBSTATE, (caddr_t)&f); + (void)kbdd_ioctl(sc->kbd, KDGKBSTATE, (caddr_t)&f); if (f & SLKED) { scp->status |= SLKED; } else { @@ -3764,7 +3764,7 @@ sc_allocate_keyboard(sc_softc_t *sc, int strcpy(ki.kb_name, k->kb_name); ki.kb_unit = k->kb_unit; - kbdd_ioctl(k0, KBADDKBD, (caddr_t) &ki); + (void)kbdd_ioctl(k0, KBADDKBD, (caddr_t) &ki); } } else idx0 = kbd_allocate("*", unit, (void *)&sc->keyboard, sckbdevent, sc);