summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-10-23 14:43:06 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-10-23 14:43:06 +0000
commit43cbf43a5f9e54decbfd837d0b5984454f2d61bf (patch)
treeb1a4cc720494cfbc571eb37b9bef0f3bfdde6bd6
parent4b29f857685e4fc6c8901a061c6de7b86ee3e993 (diff)
Revert symbol_get() changes from drm_drv
-rw-r--r--linux-core/drm_drv.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index a9eef8bc..b59b5ca5 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -463,8 +463,6 @@ static struct file_operations drm_stub_fops = {
.open = drm_stub_open
};
-static int use_inter_module = 0;
-
static int __init drm_core_init(void)
{
int ret = -ENOMEM;
@@ -491,12 +489,7 @@ static int __init drm_core_init(void)
ret = -1;
goto err_p3;
}
- drm_agp = symbol_get(drm_agp_entry);
- if (!drm_agp) {
- drm_agp = inter_module_get("drm_agp");
- use_inter_module = 1;
- }
- DRM_DEBUG("drm_agp %p\n", drm_agp);
+ drm_agp = (drm_agp_t *) inter_module_get("drm_agp");
DRM_INFO("Initialized %s %d.%d.%d %s\n",
DRIVER_NAME,
@@ -513,12 +506,9 @@ err_p1:
static void __exit drm_core_exit(void)
{
- if (drm_agp) {
- if (use_inter_module)
- inter_module_put("drm_agp");
- else
- symbol_put(drm_agp_entry);
- }
+ if (drm_agp)
+ inter_module_put("drm_agp");
+
remove_proc_entry("dri", NULL);
drm_sysfs_destroy(drm_class);