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: David Härdeman <david@hardeman.nu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index e9dae86..e16d113 100644 (file)
--- 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 981dcab..857da67 100644 (file)
--- 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;