summaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/lirc_dev.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-08-02 15:43:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 16:42:22 -0300
commit044e5878c2158d701e6f47a9604910589a384ee2 (patch)
tree9d06e2660ad15575a5df2c1e3bacfa68738ea55e /drivers/media/IR/lirc_dev.h
parentf9839da0513b4f13a137a07a9362ea5b02897bd7 (diff)
downloadlinux-044e5878c2158d701e6f47a9604910589a384ee2.tar.bz2
V4L/DVB: lirc: use unlocked_ioctl
New code should not rely on the big kernel lock, so use the unlocked_ioctl file operation in lirc. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Jarod Wilson <jarod@redhat.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/lirc_dev.h')
-rw-r--r--drivers/media/IR/lirc_dev.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/IR/lirc_dev.h b/drivers/media/IR/lirc_dev.h
index 4afd96a38a43..b1f60663cb39 100644
--- a/drivers/media/IR/lirc_dev.h
+++ b/drivers/media/IR/lirc_dev.h
@@ -216,8 +216,7 @@ void *lirc_get_pdata(struct file *file);
int lirc_dev_fop_open(struct inode *inode, struct file *file);
int lirc_dev_fop_close(struct inode *inode, struct file *file);
unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait);
-int lirc_dev_fop_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
+long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
ssize_t lirc_dev_fop_read(struct file *file, char *buffer, size_t length,
loff_t *ppos);
ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length,