Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant test if the unit numbers is in range.

This commit is contained in:
augustss 1999-01-10 18:22:14 +00:00
parent 14d2402e4b
commit c437dc4229
2 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/wscons/wskbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.15 1999/01/10 00:28:21 augustss Exp $ */
/* $NetBSD: wskbd.c,v 1.16 1999/01/10 18:22:14 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -36,7 +36,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: wskbd.c,v 1.15 1999/01/10 00:28:21 augustss Exp $";
"$NetBSD: wskbd.c,v 1.16 1999/01/10 18:22:14 augustss Exp $";
/*
* Copyright (c) 1992, 1993
@ -515,13 +515,7 @@ wskbdclose(dev, flags, mode, p)
struct proc *p;
{
#if NWSKBD > 0
struct wskbd_softc *sc;
int unit;
unit = minor(dev);
if (unit >= wskbd_cd.cd_ndevs || /* make sure it was attached */
(sc = wskbd_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wskbd_softc *sc = wskbd_cd.cd_devs[minor(dev)];
sc->sc_ready = 0; /* stop accepting events */
sc->sc_translating = 1;
@ -541,13 +535,7 @@ wskbdread(dev, uio, flags)
int flags;
{
#if NWSKBD > 0
struct wskbd_softc *sc;
int unit;
unit = minor(dev);
if (unit >= wskbd_cd.cd_ndevs || /* make sure it was attached */
(sc = wskbd_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wskbd_softc *sc = wskbd_cd.cd_devs[minor(dev)];
return (wsevent_read(&sc->sc_events, uio, flags));
#else
@ -564,13 +552,8 @@ wskbdioctl(dev, cmd, data, flag, p)
struct proc *p;
{
#if NWSKBD > 0
struct wskbd_softc *sc;
int unit, error;
unit = minor(dev);
if (unit >= wskbd_cd.cd_ndevs || /* make sure it was attached */
(sc = wskbd_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wskbd_softc *sc = wskbd_cd.cd_devs[minor(dev)];
int error;
/*
* Try the generic ioctls that the wskbd interface supports.

29
sys/dev/wscons/wsmouse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsmouse.c,v 1.5 1998/12/30 14:02:18 augustss Exp $ */
/* $NetBSD: wsmouse.c,v 1.6 1999/01/10 18:22:14 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -33,7 +33,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: wsmouse.c,v 1.5 1998/12/30 14:02:18 augustss Exp $";
"$NetBSD: wsmouse.c,v 1.6 1999/01/10 18:22:14 augustss Exp $";
/*
* Copyright (c) 1992, 1993
@ -325,13 +325,7 @@ wsmouseclose(dev, flags, mode, p)
struct proc *p;
{
#if NWSMOUSE > 0
struct wsmouse_softc *sc;
int unit;
unit = minor(dev);
if (unit >= wsmouse_cd.cd_ndevs || /* make sure it was attached */
(sc = wsmouse_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wsmouse_softc *sc = wsmouse_cd.cd_devs[minor(dev)];
if ((flags & (FREAD | FWRITE)) == FWRITE)
return (0); /* see wsmouseopen() */
@ -354,13 +348,7 @@ wsmouseread(dev, uio, flags)
int flags;
{
#if NWSMOUSE > 0
struct wsmouse_softc *sc;
int unit;
unit = minor(dev);
if (unit >= wsmouse_cd.cd_ndevs || /* make sure it was attached */
(sc = wsmouse_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wsmouse_softc *sc = wsmouse_cd.cd_devs[minor(dev)];
return (wsevent_read(&sc->sc_events, uio, flags));
#else
@ -377,13 +365,8 @@ wsmouseioctl(dev, cmd, data, flag, p)
struct proc *p;
{
#if NWSMOUSE > 0
struct wsmouse_softc *sc;
int unit, error;
unit = minor(dev);
if (unit >= wsmouse_cd.cd_ndevs || /* make sure it was attached */
(sc = wsmouse_cd.cd_devs[unit]) == NULL)
return (ENXIO);
struct wsmouse_softc *sc = wsmouse_cd.cd_devs[minor(dev)];
int error;
/*
* Try the generic ioctls that the wsmouse interface supports.