Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a55a2b3 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

[media] lirc_zilog: Use kernel standard methods for marking device non-seekable 



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: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a3064855

drivers/staging/lirc/lirc_zilog.c

+2 −7
Original line number Diff line number Diff line
@@ -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,