Commit e2cd7a43 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] fb cleanup

	switched to devfs_remove(), killed gratitious devfs_handle_t fields
	(actually, one of them became gratitious and another was completely
	 unused to start with).
parent 10a155f2
...@@ -718,9 +718,6 @@ static struct file_operations fb_fops = { ...@@ -718,9 +718,6 @@ static struct file_operations fb_fops = {
#endif #endif
}; };
static devfs_handle_t devfs_handle;
/** /**
* register_framebuffer - registers a frame buffer device * register_framebuffer - registers a frame buffer device
* @fb_info: frame buffer info structure * @fb_info: frame buffer info structure
...@@ -735,7 +732,7 @@ int ...@@ -735,7 +732,7 @@ int
register_framebuffer(struct fb_info *fb_info) register_framebuffer(struct fb_info *fb_info)
{ {
int i, j; int i, j;
char name_buf[8]; char name_buf[12];
static int fb_ever_opened[FB_MAX]; static int fb_ever_opened[FB_MAX];
static int first = 1; static int first = 1;
...@@ -771,9 +768,8 @@ register_framebuffer(struct fb_info *fb_info) ...@@ -771,9 +768,8 @@ register_framebuffer(struct fb_info *fb_info)
first = 0; first = 0;
take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default); take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);
} }
sprintf (name_buf, "%d", i); sprintf (name_buf, "fb/%d", i);
fb_info->devfs_handle = devfs_register(NULL, name_buf, DEVFS_FL_DEFAULT,
devfs_register (devfs_handle, name_buf, DEVFS_FL_DEFAULT,
FB_MAJOR, i, S_IFCHR | S_IRUGO | S_IWUGO, FB_MAJOR, i, S_IFCHR | S_IRUGO | S_IWUGO,
&fb_fops, NULL); &fb_fops, NULL);
...@@ -802,10 +798,7 @@ unregister_framebuffer(struct fb_info *fb_info) ...@@ -802,10 +798,7 @@ unregister_framebuffer(struct fb_info *fb_info)
return -EBUSY; return -EBUSY;
if (!registered_fb[i]) if (!registered_fb[i])
return -EINVAL; return -EINVAL;
devfs_unregister (fb_info->devfs_handle); devfs_remove("fb/%d", i);
fb_info->devfs_handle = NULL;
devfs_unregister (fb_info->devfs_lhandle);
fb_info->devfs_lhandle = NULL;
registered_fb[i]=NULL; registered_fb[i]=NULL;
num_registered_fb--; num_registered_fb--;
return 0; return 0;
...@@ -828,7 +821,7 @@ fbmem_init(void) ...@@ -828,7 +821,7 @@ fbmem_init(void)
create_proc_read_entry("fb", 0, 0, fbmem_read_proc, NULL); 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)) if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
printk("unable to get major %d for fb devs\n", FB_MAJOR); printk("unable to get major %d for fb devs\n", FB_MAJOR);
......
...@@ -369,8 +369,6 @@ struct fb_info { ...@@ -369,8 +369,6 @@ struct fb_info {
struct vc_data *display_fg; /* Console visible on this display */ struct vc_data *display_fg; /* Console visible on this display */
int currcon; /* Current VC. */ int currcon; /* Current VC. */
char fontname[40]; /* default font name */ char fontname[40]; /* default font name */
devfs_handle_t devfs_handle; /* Devfs handle for new name */
devfs_handle_t devfs_lhandle; /* Devfs handle for compat. symlink */
int (*changevar)(int); /* tell console var has changed */ int (*changevar)(int); /* tell console var has changed */
int (*switch_con)(int, struct fb_info*); int (*switch_con)(int, struct fb_info*);
/* tell fb to switch consoles */ /* tell fb to switch consoles */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment