diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-12-04 02:09:35 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2002-12-04 02:09:35 -0800 |
| commit | dcaf9fd79896a92df646e5f2fce04c8e61196bf7 (patch) | |
| tree | bf5b8021ae47e94dfcd56024c1ca4478160ef7c9 | |
| parent | 102349c6eeacf31ccacf8e9c8f8819304da7a257 (diff) | |
Synced to Linus BK tree.
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbmem.c | 21 |
2 files changed, 8 insertions, 15 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index a2fb330ee51b..c00f5d395afb 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -220,7 +220,7 @@ static void fbcon_vbl_detect(int irq, void *dummy, struct pt_regs *fp) static void cursor_timer_handler(unsigned long dev_addr); static struct timer_list cursor_timer = - TIMER_INITIALIZER(cursor_timer_handler, 0, 0); + TIMER_INITIALIZER(cursor_timer_handler, 0, 0); static void cursor_timer_handler(unsigned long dev_addr) { diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 70269c0a9202..27dc6417cddd 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -768,9 +768,6 @@ static struct file_operations fb_fops = { #endif }; -static devfs_handle_t devfs_handle; - - /** * register_framebuffer - registers a frame buffer device * @fb_info: frame buffer info structure @@ -784,7 +781,7 @@ static devfs_handle_t devfs_handle; int register_framebuffer(struct fb_info *fb_info) { - char name_buf[8]; + char name_buf[12]; int i; if (num_registered_fb == FB_MAX) @@ -795,11 +792,10 @@ register_framebuffer(struct fb_info *fb_info) break; fb_info->node = mk_kdev(FB_MAJOR, i); registered_fb[i] = fb_info; - sprintf (name_buf, "%d", i); - fb_info->devfs_handle = - devfs_register (devfs_handle, name_buf, DEVFS_FL_DEFAULT, - FB_MAJOR, i, S_IFCHR | S_IRUGO | S_IWUGO, - &fb_fops, NULL); + sprintf(name_buf, "fb/%d", i); + devfs_register(NULL, name_buf, DEVFS_FL_DEFAULT, + FB_MAJOR, i, S_IFCHR | S_IRUGO | S_IWUGO, + &fb_fops, NULL); return 0; } @@ -822,10 +818,7 @@ unregister_framebuffer(struct fb_info *fb_info) i = minor(fb_info->node); if (!registered_fb[i]) return -EINVAL; - devfs_unregister (fb_info->devfs_handle); - fb_info->devfs_handle = NULL; - devfs_unregister (fb_info->devfs_lhandle); - fb_info->devfs_lhandle = NULL; + devfs_remove("fb/%d", i); registered_fb[i]=NULL; num_registered_fb--; return 0; @@ -848,7 +841,7 @@ fbmem_init(void) create_proc_read_entry("fb", 0, 0, fbmem_read_proc, NULL); - devfs_handle = devfs_mk_dir (NULL, "fb", NULL); + devfs_mk_dir(NULL, "fb", NULL); if (register_chrdev(FB_MAJOR,"fb",&fb_fops)) printk("unable to get major %d for fb devs\n", FB_MAJOR); |