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

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

media: lirc_dev: remove min_timeout and max_timeout 



There are no users of this functionality (ir-lirc-codec.c has its own
implementation and lirc_zilog.c doesn't use it) so remove it.

This only affects users of the lirc kapi, not rc-core drivers.

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 c1301077

drivers/media/rc/lirc_dev.c

+0 −18
Original line number Diff line number Diff line
@@ -346,24 +346,6 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case LIRC_GET_LENGTH:

		result = put_user(d->code_length, (__u32 __user *)arg);

		break;

	case LIRC_GET_MIN_TIMEOUT:

		if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||

		    d->min_timeout == 0) {

			result = -ENOTTY;

			break;

		}



		result = put_user(d->min_timeout, (__u32 __user *)arg);

		break;

	case LIRC_GET_MAX_TIMEOUT:

		if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||

		    d->max_timeout == 0) {

			result = -ENOTTY;

			break;

		}



		result = put_user(d->max_timeout, (__u32 __user *)arg);

		break;

	default:

		result = -ENOTTY;

	}

include/media/lirc_dev.h

+0 −6
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf, 
 * @chunk_size:		Size of each FIFO buffer.

 *			Only used if @rbuf is NULL.

 * @data:		private per-driver data

 * @min_timeout:	Minimum timeout for record. Valid only if

 *			LIRC_CAN_SET_REC_TIMEOUT is defined.

 * @max_timeout:	Maximum timeout for record. Valid only if

 *			LIRC_CAN_SET_REC_TIMEOUT is defined.

 * @buf:		if %NULL, lirc_dev will allocate and manage the buffer,

 *			otherwise allocated by the caller which will

 *			have to write to the buffer by other means, like irq's
@@ -155,8 +151,6 @@ struct lirc_dev { 
	bool buf_internal;



	void *data;

	int min_timeout;

	int max_timeout;

	struct rc_dev *rdev;

	const struct file_operations *fops;

	struct module *owner;