OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nvidiafb: remove open_lock mutex 

Remove mutex from the nvidiafb_open/nvidiafb_release functions as these
operations are mutexed at fb layer.

Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alessio Igor Bogani 2009-03-31 15:25:46 -07:00 committed by Linus Torvalds
parent 18b41f1cd5
commit 98da329581
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/nvidia/nv_type.h
View File

@ -5,7 +5,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/mutex.h>
#include <video/vga.h> #include <video/vga.h>
#define NV_ARCH_04 0x04 #define NV_ARCH_04 0x04
@ -99,7 +98,6 @@ struct nvidia_par {
RIVA_HW_STATE initial_state; RIVA_HW_STATE initial_state;
RIVA_HW_STATE *CurrentState; RIVA_HW_STATE *CurrentState;
struct vgastate vgastate; struct vgastate vgastate;
struct mutex open_lock;
u32 pseudo_palette[16]; u32 pseudo_palette[16];
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
u32 Architecture; u32 Architecture;

7
drivers/video/nvidia/nvidia.c
View File

@ -1004,15 +1004,12 @@ static int nvidiafb_open(struct fb_info *info, int user)
{ {
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
mutex_lock(&par->open_lock);
if (!par->open_count) { if (!par->open_count) {
save_vga_x86(par); save_vga_x86(par);
nvidia_save_vga(par, &par->initial_state); nvidia_save_vga(par, &par->initial_state);
} }
par->open_count++; par->open_count++;
mutex_unlock(&par->open_lock);
return 0; return 0;
} }
@ -1021,8 +1018,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
int err = 0; int err = 0;
mutex_lock(&par->open_lock);
if (!par->open_count) { if (!par->open_count) {
err = -EINVAL; err = -EINVAL;
goto done; goto done;
@ -1035,7 +1030,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
par->open_count--; par->open_count--;
done: done:
mutex_unlock(&par->open_lock);
return err; return err;
} }
@ -1300,7 +1294,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
par = info->par; par = info->par;
par->pci_dev = pd; par->pci_dev = pd;
mutex_init(&par->open_lock);
info->pixmap.addr = kzalloc(8 * 1024, GFP_KERNEL); info->pixmap.addr = kzalloc(8 * 1024, GFP_KERNEL);
if (info->pixmap.addr == NULL) if (info->pixmap.addr == NULL)