diff options
Diffstat (limited to 'drivers/sbus/char/display7seg.c')
-rw-r--r-- | drivers/sbus/char/display7seg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 7baf1b644039..4ad4d2c91075 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/miscdevice.h> | 13 | #include <linux/miscdevice.h> |
14 | #include <linux/ioport.h> /* request_region */ | 14 | #include <linux/ioport.h> /* request_region */ |
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/smp_lock.h> | 16 | #include <linux/mutex.h> |
17 | #include <linux/of.h> | 17 | #include <linux/of.h> |
18 | #include <linux/of_device.h> | 18 | #include <linux/of_device.h> |
19 | #include <asm/atomic.h> | 19 | #include <asm/atomic.h> |
@@ -26,6 +26,7 @@ | |||
26 | #define DRIVER_NAME "d7s" | 26 | #define DRIVER_NAME "d7s" |
27 | #define PFX DRIVER_NAME ": " | 27 | #define PFX DRIVER_NAME ": " |
28 | 28 | ||
29 | static DEFINE_MUTEX(d7s_mutex); | ||
29 | static int sol_compat = 0; /* Solaris compatibility mode */ | 30 | static int sol_compat = 0; /* Solaris compatibility mode */ |
30 | 31 | ||
31 | /* Solaris compatibility flag - | 32 | /* Solaris compatibility flag - |
@@ -74,7 +75,6 @@ static int d7s_open(struct inode *inode, struct file *f) | |||
74 | { | 75 | { |
75 | if (D7S_MINOR != iminor(inode)) | 76 | if (D7S_MINOR != iminor(inode)) |
76 | return -ENODEV; | 77 | return -ENODEV; |
77 | cycle_kernel_lock(); | ||
78 | atomic_inc(&d7s_users); | 78 | atomic_inc(&d7s_users); |
79 | return 0; | 79 | return 0; |
80 | } | 80 | } |
@@ -110,7 +110,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
110 | if (D7S_MINOR != iminor(file->f_path.dentry->d_inode)) | 110 | if (D7S_MINOR != iminor(file->f_path.dentry->d_inode)) |
111 | return -ENODEV; | 111 | return -ENODEV; |
112 | 112 | ||
113 | lock_kernel(); | 113 | mutex_lock(&d7s_mutex); |
114 | switch (cmd) { | 114 | switch (cmd) { |
115 | case D7SIOCWR: | 115 | case D7SIOCWR: |
116 | /* assign device register values we mask-out D7S_FLIP | 116 | /* assign device register values we mask-out D7S_FLIP |
@@ -151,7 +151,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
151 | writeb(regs, p->regs); | 151 | writeb(regs, p->regs); |
152 | break; | 152 | break; |
153 | }; | 153 | }; |
154 | unlock_kernel(); | 154 | mutex_unlock(&d7s_mutex); |
155 | 155 | ||
156 | return error; | 156 | return error; |
157 | } | 157 | } |