diff options
author | rpaulo <rpaulo@FreeBSD.org> | 2010-10-13 11:37:12 +0000 |
---|---|---|
committer | rpaulo <rpaulo@FreeBSD.org> | 2010-10-13 11:37:12 +0000 |
commit | c039317a5f2cce1219900499317a54e9f8b1d9c8 (patch) | |
tree | c38716d35642b6b30d9968bd2408884836e18e52 | |
parent | 7bca860ea7baaf6503c57577ef049c3c139f042f (diff) | |
download | FreeBSD-src-c039317a5f2cce1219900499317a54e9f8b1d9c8.zip FreeBSD-src-c039317a5f2cce1219900499317a54e9f8b1d9c8.tar.gz |
Explicitly tell the compiler that we don't care about the return value
of kbdd_ioctl().
-rw-r--r-- | sys/dev/kbd/kbd.c | 10 | ||||
-rw-r--r-- | sys/dev/kbdmux/kbdmux.c | 8 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 22 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 0813676..21818cb 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -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 keycode, int up, int *shiftstate, #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 keycode, int up, int *shiftstate, #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: diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c index 990c8c3..64d5c24 100644 --- a/sys/dev/kbdmux/kbdmux.c +++ b/sys/dev/kbdmux/kbdmux.c @@ -1115,7 +1115,7 @@ kbdmux_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) /* 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, caddr_t arg) /* 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, caddr_t arg) /* 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, caddr_t arg) /* 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 */ diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 4bf5e15..2f41f3a 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -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, caddr_t data, struct thread *td) 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, caddr_t data, struct thread *td) } 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 unit) 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); |