[patch] 4210_fb-reverse.patch

4210_fb-reverse.patch (text/plain), 2.75 KB, created by iGentoo on 2011-05-23 12:05:59 UTC

 drivers/video/fbmem.c |   16 ----------------
 include/linux/fb.h    |    1 -
 2 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 5aac00e..e7f7bc1 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -42,7 +42,6 @@
 
 #define FBPIXMAPSIZE	(1024 * 8)
 
-static DEFINE_MUTEX(registration_lock);
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
 
@@ -53,19 +52,13 @@ static struct fb_info *get_fb_info(unsigned int idx)
 	if (idx >= FB_MAX)
 		return ERR_PTR(-ENODEV);
 
-	mutex_lock(&registration_lock);
 	fb_info = registered_fb[idx];
-	if (fb_info)
-		atomic_inc(&fb_info->count);
-	mutex_unlock(&registration_lock);
 
 	return fb_info;
 }
 
 static void put_fb_info(struct fb_info *fb_info)
 {
-	if (!atomic_dec_and_test(&fb_info->count))
-		return;
 	if (fb_info->fbops->fb_destroy)
 		fb_info->fbops->fb_destroy(fb_info);
 }
@@ -672,7 +665,6 @@ int fb_show_logo(struct fb_info *info, int rotate) { return 0; }
 
 static void *fb_seq_start(struct seq_file *m, loff_t *pos)
 {
-	mutex_lock(&registration_lock);
 	return (*pos < FB_MAX) ? pos : NULL;
 }
 
@@ -684,7 +676,6 @@ static void *fb_seq_next(struct seq_file *m, void *v, loff_t *pos)
 
 static void fb_seq_stop(struct seq_file *m, void *v)
 {
-	mutex_unlock(&registration_lock);
 }
 
 static int fb_seq_show(struct seq_file *m, void *v)
@@ -1587,7 +1578,6 @@ static int do_register_framebuffer(struct fb_info *fb_info)
 		if (!registered_fb[i])
 			break;
 	fb_info->node = i;
-	atomic_set(&fb_info->count, 1);
 	mutex_init(&fb_info->lock);
 	mutex_init(&fb_info->mm_lock);
 
@@ -1670,9 +1660,7 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
 void remove_conflicting_framebuffers(struct apertures_struct *a,
 				     const char *name, bool primary)
 {
-	mutex_lock(&registration_lock);
 	do_remove_conflicting_framebuffers(a, name, primary);
-	mutex_unlock(&registration_lock);
 }
 EXPORT_SYMBOL(remove_conflicting_framebuffers);
 
@@ -1690,9 +1678,7 @@ register_framebuffer(struct fb_info *fb_info)
 {
 	int ret;
 
-	mutex_lock(&registration_lock);
 	ret = do_register_framebuffer(fb_info);
-	mutex_unlock(&registration_lock);
 
 	return ret;
 }
@@ -1718,9 +1704,7 @@ unregister_framebuffer(struct fb_info *fb_info)
 {
 	int ret;
 
-	mutex_lock(&registration_lock);
 	ret = do_unregister_framebuffer(fb_info);
-	mutex_unlock(&registration_lock);
 
 	return ret;
 }
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 6a82748..df728c1 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -832,7 +832,6 @@ struct fb_tile_ops {
 #define FBINFO_CAN_FORCE_OUTPUT     0x200000
 
 struct fb_info {
-	atomic_t count;
 	int node;
 	int flags;
 	struct mutex lock;		/* Lock for open/release/ioctl funcs */