summaryrefslogtreecommitdiff
path: root/arch/blackfin/mach-bf561
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-10-13 16:50:05 +0400
committerMike Frysinger <vapier@gentoo.org>2009-12-15 08:14:21 +0300
commit17a1b5e3748f2d890d24c7eb3b1c11de2e0b9a00 (patch)
tree6ffb49f97876c2cd850193095e0a00767008e075 /arch/blackfin/mach-bf561
parentd2e015d65fc692475b8513259d6afacd2cded8e8 (diff)
downloadlinux-17a1b5e3748f2d890d24c7eb3b1c11de2e0b9a00.tar.xz
Blackfin: coreb: switched to unlocked_ioctl
We don't need the BKL and now people will stop looking at this. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf561')
-rw-r--r--arch/blackfin/mach-bf561/coreb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index 1e60a92dd602..deb2271d09a3 100644
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -22,8 +22,8 @@
#define CMD_COREB_STOP 3
#define CMD_COREB_RESET 4
-static int
-coreb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long
+coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int ret = 0;
@@ -49,8 +49,8 @@ coreb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned l
}
static const struct file_operations coreb_fops = {
- .owner = THIS_MODULE,
- .ioctl = coreb_ioctl,
+ .owner = THIS_MODULE,
+ .unlocked_ioctl = coreb_ioctl,
};
static struct miscdevice coreb_dev = {