Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/wscons -remove a check of errno against -1, this is ...



details:   https://anonhg.NetBSD.org/src/rev/4c2e9f321117
branches:  trunk
changeset: 555791:4c2e9f321117
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Nov 28 13:19:46 2003 +0000

description:
-remove a check of errno against -1, this is nonsense since
 we have EPASSTHROUGH
-remove a superflous #if NWSMOUSE

diffstat:

 sys/dev/wscons/wsmouse.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 9b6354c40ac7 -r 4c2e9f321117 sys/dev/wscons/wsmouse.c
--- a/sys/dev/wscons/wsmouse.c  Fri Nov 28 08:56:48 2003 +0000
+++ b/sys/dev/wscons/wsmouse.c  Fri Nov 28 13:19:46 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.33 2003/09/21 19:17:01 jdolecek Exp $ */
+/* $NetBSD: wsmouse.c,v 1.34 2003/11/28 13:19:46 drochner Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.33 2003/09/21 19:17:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.34 2003/11/28 13:19:46 drochner Exp $");
 
 #include "wsmouse.h"
 #include "wsdisplay.h"
@@ -151,9 +151,7 @@
 CFATTACH_DECL(wsmouse, sizeof (struct wsmouse_softc),
     wsmouse_match, wsmouse_attach, wsmouse_detach, wsmouse_activate);
 
-#if NWSMOUSE > 0
 extern struct cfdriver wsmouse_cd;
-#endif /* NWSMOUSE > 0 */
 
 dev_type_open(wsmouseopen);
 dev_type_close(wsmouseclose);
@@ -605,7 +603,7 @@
         */
        error = (*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd,
            data, flag, p);
-       return (error != -1 ? error : ENOTTY);
+       return (error); /* may be EPASSTHROUGH */
 }
 
 int



Home | Main Index | Thread Index | Old Index