shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: media: lirc_dev: remove min_timeout and max_timeout

Browse Source 
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>
(cherry picked from commit 2265425fd9)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
This commit is contained in:
David Härdeman
2017-06-25 08:31:30 -04:00
committed by Tao Huang
parent ea1de491d6
commit 77425ec5d0
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/rc/lirc_dev.c
View File

@@ -352,24 +352,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;
}

6
include/media/lirc_dev.h
View File

@@ -132,10 +132,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
@@ -162,8 +158,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;