mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 08:49:45 +00:00
Code Issues Releases Wiki Activity

media: ite-cir: in_use is not needed

Browse source 
The in_use variable is set to true when a lirc file is opened, and ir
transmit can only be done by writing to a lirc file descriptor. As a
result when in_use is read, it is always true, so we might as well remove
it.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sean Young 2021-02-22 14:46:42 +01:00 committed by Mauro Carvalho Chehab
parent 28c7afb07c
commit 0ec694d671
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/rc/ite-cir.c
View file

@ -364,7 +364,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
* has been pushed out */
fifo_avail = ITE_TX_FIFO_LEN - dev->params->get_tx_used_slots(dev);
while (n > 0 && dev->in_use) {
while (n > 0) {
/* transmit the next sample */
is_pulse = !is_pulse;
remaining_us = *(txbuf++);
@ -374,7 +374,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
is_pulse ? "pulse" : "space", remaining_us);
/* repeat while the pulse is non-zero length */
while (remaining_us > 0 && dev->in_use) {
while (remaining_us > 0) {
if (remaining_us > max_rle_us)
next_rle_us = max_rle_us;
@ -461,8 +461,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
ite_set_carrier_params(dev);
/* re-enable the receiver */
if (dev->in_use)
dev->params->enable_rx(dev);
dev->params->enable_rx(dev);
/* notify transmission end */
wake_up_interruptible(&dev->tx_ended);
@ -1177,7 +1176,6 @@ static int ite_open(struct rc_dev *rcdev)
unsigned long flags;
spin_lock_irqsave(&dev->lock, flags);
dev->in_use = true;
/* enable the receiver */
dev->params->enable_rx(dev);
@ -1194,7 +1192,6 @@ static void ite_close(struct rc_dev *rcdev)
unsigned long flags;
spin_lock_irqsave(&dev->lock, flags);
dev->in_use = false;
/* wait for any transmission to end */
spin_unlock_irqrestore(&dev->lock, flags);

2
drivers/media/rc/ite-cir.h
View file

@ -81,7 +81,7 @@ struct ite_dev {
/* sync data */
spinlock_t lock;
bool in_use, transmitting;
bool transmitting;
/* transmit support */
wait_queue_head_t tx_queue, tx_ended;