]> Pileus Git - ~andy/linux/commitdiff
[media] lirc_zilog: Use kernel standard methods for marking device non-seekable
authorAndy Walls <awalls@md.metrocast.net>
Thu, 27 Jan 2011 03:04:15 +0000 (00:04 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 22 Mar 2011 22:23:54 +0000 (19:23 -0300)
lirc_zilog had its own llseek stub that returned -ESPIPE.  Get rid of
it and use the kernel's no_llseek() and nonseekable_open() functions
instead.

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/lirc/lirc_zilog.c

index c857b99e5ace00d1cf3325d812fcfd52c2d3f634..720ef6739d0e5b529197d7e14f817effd8ee0f1e 100644 (file)
@@ -712,12 +712,6 @@ static int tx_init(struct IR_tx *tx)
        return 0;
 }
 
-/* do nothing stub to make LIRC happy */
-static loff_t lseek(struct file *filep, loff_t offset, int orig)
-{
-       return -ESPIPE;
-}
-
 /* copied from lirc_dev */
 static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 {
@@ -1099,6 +1093,7 @@ static int open(struct inode *node, struct file *filep)
        /* stash our IR struct */
        filep->private_data = ir;
 
+       nonseekable_open(node, filep);
        return 0;
 }
 
@@ -1150,7 +1145,7 @@ static struct i2c_driver driver = {
 
 static const struct file_operations lirc_fops = {
        .owner          = THIS_MODULE,
-       .llseek         = lseek,
+       .llseek         = no_llseek,
        .read           = read,
        .write          = write,
        .poll           = poll,