Module Name: src
Committed By: dyoung
Date: Sun Dec 6 22:51:25 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drmP.h drm_drv.c i915_drv.c
mach64_drv.c mga_drv.c r128_drv.c radeon_drv.c savage_drv.c
sis_drv.c tdfx_drv.c via_drv.c
Log Message:
Delete the do-nothing device-activation hook, drm_activate().
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/via_drv.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drmP.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.14 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.15
--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.14 Wed Sep 2 01:36:41 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Sun Dec 6 22:51:25 2009
@@ -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);
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.17 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.18
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.17 Wed Sep 2 01:36:41 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Dec 6 22:51:25 2009
@@ -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,
Index: src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.5 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.6
--- src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.5 Sun Sep 27 12:59:38 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/via_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/via_drv.c:1.5 src/sys/external/bsd/drm/dist/bsd-core/via_drv.c:1.6
--- src/sys/external/bsd/drm/dist/bsd-core/via_drv.c:1.5 Sun Sep 27 12:58:51 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/via_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c:1.4 src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c:1.5
--- src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.7
--- src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c:1.6 Wed Jun 24 19:47:15 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c Sun Dec 6 22:51:25 2009
@@ -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
Index: src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.3 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.4
--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.3 Fri Jun 19 03:50:03 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c Sun Dec 6 22:51:25 2009
@@ -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
