[src/trunk]: src/sys/dev/pckbport options PMS_DISABLE_POWERHOOK has been obso...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18d0dfbf46f1
branches:  trunk
changeset: 769378:18d0dfbf46f1
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Sep 07 19:05:13 2011 +0000

description:
options PMS_DISABLE_POWERHOOK has been obsolete for a while now,
remove what little still remains of it.

diffstat:

 sys/dev/pckbport/files.pckbport |  4 ++--
 sys/dev/pckbport/pms.c          |  7 ++-----
 sys/dev/pckbport/pmsvar.h       |  6 +-----
 3 files changed, 5 insertions(+), 12 deletions(-)

diffs (66 lines):

diff -r 17a69444aad2 -r 18d0dfbf46f1 sys/dev/pckbport/files.pckbport
--- a/sys/dev/pckbport/files.pckbport   Wed Sep 07 18:21:41 2011 +0000
+++ b/sys/dev/pckbport/files.pckbport   Wed Sep 07 19:05:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pckbport,v 1.7 2008/12/14 00:42:33 jmcneill Exp $
+# $NetBSD: files.pckbport,v 1.8 2011/09/07 19:05:13 jakllsch Exp $
 # devices attached at pckbport, for use with wscons
 
 defflag        opt_wskbdmap.h                  WSKBD_USONLY
@@ -13,7 +13,7 @@
 defparam PCKBD_LAYOUT
 defflag        PCKBD_CNATTACH_MAY_FAIL
 
-defflag        opt_pms.h                       PMS_DISABLE_POWERHOOK
+obsolete defflag opt_pms.h             PMS_DISABLE_POWERHOOK
 defflag        opt_pms.h                       PMS_SYNAPTICS_TOUCHPAD
 defflag opt_pms.h                      PMS_ELANTECH_TOUCHPAD
 device pms: wsmousedev
diff -r 17a69444aad2 -r 18d0dfbf46f1 sys/dev/pckbport/pms.c
--- a/sys/dev/pckbport/pms.c    Wed Sep 07 18:21:41 2011 +0000
+++ b/sys/dev/pckbport/pms.c    Wed Sep 07 19:05:13 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.31 2011/05/24 16:42:53 joerg Exp $ */
+/* $NetBSD: pms.c,v 1.32 2011/09/07 19:05:13 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.31 2011/05/24 16:42:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.32 2011/09/07 19:05:13 jakllsch Exp $");
 
 #include "opt_pms.h"
 
@@ -232,9 +232,6 @@
        kthread_create(PRI_NONE, 0, NULL, pms_reset_thread, sc,
            &sc->sc_event_thread, "%s", device_xname(sc->sc_dev));
 
-#ifndef PMS_DISABLE_POWERHOOK
-       sc->sc_suspended = 0;
-#endif
        if (!pmf_device_register(self, pms_suspend, pms_resume))
                aprint_error_dev(self, "couldn't establish power handler\n");
 }
diff -r 17a69444aad2 -r 18d0dfbf46f1 sys/dev/pckbport/pmsvar.h
--- a/sys/dev/pckbport/pmsvar.h Wed Sep 07 18:21:41 2011 +0000
+++ b/sys/dev/pckbport/pmsvar.h Wed Sep 07 19:05:13 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmsvar.h,v 1.8 2008/12/14 00:42:33 jmcneill Exp $      */
+/*     $NetBSD: pmsvar.h,v 1.9 2011/09/07 19:05:13 jakllsch Exp $      */
 
 /*-
  * Copyright (c) 2004 Kentaro Kurahone.
@@ -53,10 +53,6 @@
        int sc_kbcslot;
 
        int sc_enabled;         /* input enabled? */
-#ifndef PMS_DISABLE_POWERHOOK
-       void *sc_powerhook;     /* cookie from power hook */
-       int sc_suspended;       /* suspended? */
-#endif /* !PMS_DISABLE_POWERHOOK */
        int inputstate;         /* number of bytes received for this packet */
        u_int buttons;          /* mouse button status */
        enum pms_type protocol;