[src/trunk]: src/sys/external/bsd/drm/dist/bsd-core Delete the do-nothing dev...

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

details:   https://anonhg.NetBSD.org/src/rev/d9a0a30525ce
branches:  trunk
changeset: 749739:d9a0a30525ce
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Dec 06 22:51:25 2009 +0000

description:
Delete the do-nothing device-activation hook, drm_activate().

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drmP.h       |   1 -
 sys/external/bsd/drm/dist/bsd-core/drm_drv.c    |  15 ---------------
 sys/external/bsd/drm/dist/bsd-core/i915_drv.c   |   2 +-
 sys/external/bsd/drm/dist/bsd-core/mach64_drv.c |   2 +-
 sys/external/bsd/drm/dist/bsd-core/mga_drv.c    |   2 +-
 sys/external/bsd/drm/dist/bsd-core/r128_drv.c   |   2 +-
 sys/external/bsd/drm/dist/bsd-core/radeon_drv.c |   2 +-
 sys/external/bsd/drm/dist/bsd-core/savage_drv.c |   2 +-
 sys/external/bsd/drm/dist/bsd-core/sis_drv.c    |   2 +-
 sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c   |   2 +-
 sys/external/bsd/drm/dist/bsd-core/via_drv.c    |   2 +-
 11 files changed, 9 insertions(+), 25 deletions(-)

diffs (144 lines):

diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/drmP.h
--- a/sys/external/bsd/drm/dist/bsd-core/drmP.h Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drmP.h Sun Dec 06 22:51:25 2009 +0000
@@ -946,7 +946,6 @@
 int    drm_probe(struct pci_attach_args *pa, drm_pci_id_list_t *idlist);
 void   drm_attach(device_t kdev, struct pci_attach_args *pa, drm_pci_id_list_t *idlist);
 int     drm_detach(device_t self, int flags);
-int     drm_activate(device_t self, devact_t act);
 dev_type_ioctl(drm_ioctl);
 dev_type_open(drm_open);
 dev_type_close(drm_close);
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/drm_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_drv.c      Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_drv.c      Sun Dec 06 22:51:25 2009 +0000
@@ -434,21 +434,6 @@
        return 0;
 }
 
-int
-drm_activate(device_t self, devact_t act)
-{
-       switch (act) {
-       case DVACT_ACTIVATE:
-               return (EOPNOTSUPP);
-               break;
-
-       case DVACT_DEACTIVATE:
-               /* FIXME */
-               break;
-       }
-       return (0);
-}
-
 #endif
 
 drm_pci_id_list_t *drm_find_description(int vendor, int device,
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/i915_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/i915_drv.c     Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/i915_drv.c     Sun Dec 06 22:51:25 2009 +0000
@@ -212,7 +212,7 @@
 }
 
 CFATTACH_DECL_NEW(i915drm, sizeof(struct drm_device), i915drm_probe,
-    i915drm_attach, i915drm_detach, drm_activate);
+    i915drm_attach, i915drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/mach64_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c   Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c   Sun Dec 06 22:51:25 2009 +0000
@@ -161,7 +161,7 @@
 }
 
 CFATTACH_DECL_NEW(mach64drm, sizeof(struct drm_device),
-    mach64drm_probe, mach64drm_attach, drm_detach, drm_activate);
+    mach64drm_probe, mach64drm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/mga_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/mga_drv.c      Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/mga_drv.c      Sun Dec 06 22:51:25 2009 +0000
@@ -224,7 +224,7 @@
 }
 
 CFATTACH_DECL_NEW(mgadrm, sizeof(struct drm_device),
-    mgadrm_probe, mgadrm_attach, drm_detach, drm_activate);
+    mgadrm_probe, mgadrm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/r128_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/r128_drv.c     Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/r128_drv.c     Sun Dec 06 22:51:25 2009 +0000
@@ -159,7 +159,7 @@
 }
 
 CFATTACH_DECL_NEW(r128drm, sizeof(struct drm_device),
-    r128drm_probe, r128drm_attach, drm_detach, drm_activate);
+    r128drm_probe, r128drm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c   Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c   Sun Dec 06 22:51:25 2009 +0000
@@ -156,7 +156,7 @@
 }
 
 CFATTACH_DECL_NEW(radeondrm, sizeof(struct drm_device),
-    radeondrm_probe, radeondrm_attach, drm_detach, drm_activate);
+    radeondrm_probe, radeondrm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/savage_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/savage_drv.c   Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/savage_drv.c   Sun Dec 06 22:51:25 2009 +0000
@@ -144,7 +144,7 @@
 }
 
 CFATTACH_DECL_NEW(savagedrm, sizeof(struct drm_device),
-    savagedrm_probe, savagedrm_attach, drm_detach, drm_activate);
+    savagedrm_probe, savagedrm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/sis_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/sis_drv.c      Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/sis_drv.c      Sun Dec 06 22:51:25 2009 +0000
@@ -138,7 +138,7 @@
 }
 
 CFATTACH_DECL_NEW(sisdrm, sizeof(struct drm_device),
-    sisdrm_probe, sisdrm_attach, drm_detach, drm_activate);
+    sisdrm_probe, sisdrm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c     Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c     Sun Dec 06 22:51:25 2009 +0000
@@ -140,7 +140,7 @@
 }
 
 CFATTACH_DECL_NEW(tdfxdrm, sizeof(struct drm_device),
-    tdfxdrm_probe, tdfxdrm_attach, drm_detach, drm_activate);
+    tdfxdrm_probe, tdfxdrm_attach, drm_detach, NULL);
 
 #ifdef _MODULE
 
diff -r 7b3c59675aa8 -r d9a0a30525ce sys/external/bsd/drm/dist/bsd-core/via_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/via_drv.c      Sun Dec 06 22:49:48 2009 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/via_drv.c      Sun Dec 06 22:51:25 2009 +0000
@@ -156,7 +156,7 @@
 }
 
 CFATTACH_DECL_NEW(viadrm, sizeof(struct drm_device),
-    viadrm_probe, viadrm_attach, viadrm_detach, drm_activate);
+    viadrm_probe, viadrm_attach, viadrm_detach, NULL);
 
 #ifdef _MODULE