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

Commit 52e809f9 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

[media] lirc_dev: remove pointless functions 



drv->set_use_inc and drv->set_use_dec are already optional so we can
remove all dummy functions.

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c779a9cd

drivers/media/rc/ir-lirc-codec.c

+2 −12
Original line number Diff line number Diff line
@@ -327,16 +327,6 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd, 
	return ret;

}



static int ir_lirc_open(void *data)

{

	return 0;

}



static void ir_lirc_close(void *data)

{

	return;

}



static const struct file_operations lirc_fops = {

	.owner		= THIS_MODULE,

	.write		= ir_lirc_transmit_ir,
@@ -396,8 +386,8 @@ static int ir_lirc_register(struct rc_dev *dev) 
	drv->features = features;

	drv->data = &dev->raw->lirc;

	drv->rbuf = NULL;

	drv->set_use_inc = &ir_lirc_open;

	drv->set_use_dec = &ir_lirc_close;

	drv->set_use_inc = NULL;

	drv->set_use_dec = NULL;

	drv->code_length = sizeof(struct ir_raw_event) * 8;

	drv->chunk_size = sizeof(int);

	drv->buffer_size = LIRCBUF_SIZE;

drivers/staging/media/lirc/lirc_zilog.c

+0 −11
Original line number Diff line number Diff line
@@ -497,15 +497,6 @@ static int lirc_thread(void *arg) 
	return 0;

}



static int set_use_inc(void *data)

{

	return 0;

}



static void set_use_dec(void *data)

{

}



/* safe read of a uint32 (always network byte order) */

static int read_uint32(unsigned char **data,

				     unsigned char *endp, unsigned int *val)
@@ -1396,8 +1387,6 @@ static struct lirc_driver lirc_template = { 
	.buffer_size	= BUFLEN / 2,

	.sample_rate	= 0, /* tell lirc_dev to not start its own kthread */

	.chunk_size	= 2,

	.set_use_inc	= set_use_inc,

	.set_use_dec	= set_use_dec,

	.fops		= &lirc_fops,

	.owner		= THIS_MODULE,

};