mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

[media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function

Browse source 
The driver is now structured so that it must handle an IR Tx unit
for a Z8 IR chip, or it refuses to handle that Z8 IR chip.  This
allows us to assume that ir->tx != NULL in a few places in the driver,
and also allows us to always report Tx is available to userspace.
Get rid of unneeded tests for ir->tx == NULL and always report that
Tx is available.

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andy Walls 2011-01-15 22:32:33 -03:00 committed by Mauro Carvalho Chehab
parent b757730b02
commit 8090232a23
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/lirc/lirc_zilog.c
View file

@ -206,8 +206,7 @@ static int add_to_buf(struct IR *ir)
return -ENODATA; return -ENODATA;
} }
schedule_timeout((100 * HZ + 999) / 1000); schedule_timeout((100 * HZ + 999) / 1000);
if (ir->tx != NULL) ir->tx->need_boot = 1;
ir->tx->need_boot = 1;
++failures; ++failures;
mutex_unlock(&ir->ir_lock); mutex_unlock(&ir->ir_lock);
@ -1010,10 +1009,9 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
int result; int result;
unsigned long mode, features = 0; unsigned long mode, features = 0;
features |= LIRC_CAN_SEND_PULSE;
if (ir->rx != NULL) if (ir->rx != NULL)
features |= LIRC_CAN_REC_LIRCCODE; features |= LIRC_CAN_REC_LIRCCODE;
if (ir->tx != NULL)
features |= LIRC_CAN_SEND_PULSE;
switch (cmd) { switch (cmd) {
case LIRC_GET_LENGTH: case LIRC_GET_LENGTH:
@ -1040,15 +1038,9 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
result = -EINVAL; result = -EINVAL;
break; break;
case LIRC_GET_SEND_MODE: case LIRC_GET_SEND_MODE:
if (!(features&LIRC_CAN_SEND_MASK))
return -ENOSYS;
result = put_user(LIRC_MODE_PULSE, (unsigned long *) arg); result = put_user(LIRC_MODE_PULSE, (unsigned long *) arg);
break; break;
case LIRC_SET_SEND_MODE: case LIRC_SET_SEND_MODE:
if (!(features&LIRC_CAN_SEND_MASK))
return -ENOSYS;
result = get_user(mode, (unsigned long *) arg); result = get_user(mode, (unsigned long *) arg);
if (!result && mode != LIRC_MODE_PULSE) if (!result && mode != LIRC_MODE_PULSE)
return -EINVAL; return -EINVAL;
@ -1380,12 +1372,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
* after registering with lirc as otherwise hotplug seems to take * after registering with lirc as otherwise hotplug seems to take
* 10s to create the lirc device. * 10s to create the lirc device.
*/ */
if (ir->tx != NULL) { ret = tx_init(ir->tx);
/* Special TX init */ if (ret != 0)
ret = tx_init(ir->tx); goto out_unregister;
if (ret != 0)
goto out_unregister;
}
zilog_info("probe of IR %s on %s (i2c-%d) done. IR unit ready.\n", zilog_info("probe of IR %s on %s (i2c-%d) done. IR unit ready.\n",
tx_probe ? "Tx" : "Rx", adap->name, adap->nr); tx_probe ? "Tx" : "Rx", adap->name, adap->nr);