summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/rc/lirc_dev.c18
-rw-r--r--include/media/lirc_dev.h6
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index e9dae8621670..e16d1138ca48 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -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;
}
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index 981dcabd5fd5..857da67bd931 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -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;