Commit 0ec694d6 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

media: ite-cir: in_use is not needed

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: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 28c7afb0
...@@ -364,7 +364,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n) ...@@ -364,7 +364,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
* has been pushed out */ * has been pushed out */
fifo_avail = ITE_TX_FIFO_LEN - dev->params->get_tx_used_slots(dev); 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 */ /* transmit the next sample */
is_pulse = !is_pulse; is_pulse = !is_pulse;
remaining_us = *(txbuf++); remaining_us = *(txbuf++);
...@@ -374,7 +374,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n) ...@@ -374,7 +374,7 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
is_pulse ? "pulse" : "space", remaining_us); is_pulse ? "pulse" : "space", remaining_us);
/* repeat while the pulse is non-zero length */ /* 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) if (remaining_us > max_rle_us)
next_rle_us = max_rle_us; next_rle_us = max_rle_us;
...@@ -461,7 +461,6 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n) ...@@ -461,7 +461,6 @@ static int ite_tx_ir(struct rc_dev *rcdev, unsigned *txbuf, unsigned n)
ite_set_carrier_params(dev); ite_set_carrier_params(dev);
/* re-enable the receiver */ /* re-enable the receiver */
if (dev->in_use)
dev->params->enable_rx(dev); dev->params->enable_rx(dev);
/* notify transmission end */ /* notify transmission end */
...@@ -1177,7 +1176,6 @@ static int ite_open(struct rc_dev *rcdev) ...@@ -1177,7 +1176,6 @@ static int ite_open(struct rc_dev *rcdev)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dev->lock, flags); spin_lock_irqsave(&dev->lock, flags);
dev->in_use = true;
/* enable the receiver */ /* enable the receiver */
dev->params->enable_rx(dev); dev->params->enable_rx(dev);
...@@ -1194,7 +1192,6 @@ static void ite_close(struct rc_dev *rcdev) ...@@ -1194,7 +1192,6 @@ static void ite_close(struct rc_dev *rcdev)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dev->lock, flags); spin_lock_irqsave(&dev->lock, flags);
dev->in_use = false;
/* wait for any transmission to end */ /* wait for any transmission to end */
spin_unlock_irqrestore(&dev->lock, flags); spin_unlock_irqrestore(&dev->lock, flags);
......
...@@ -81,7 +81,7 @@ struct ite_dev { ...@@ -81,7 +81,7 @@ struct ite_dev {
/* sync data */ /* sync data */
spinlock_t lock; spinlock_t lock;
bool in_use, transmitting; bool transmitting;
/* transmit support */ /* transmit support */
wait_queue_head_t tx_queue, tx_ended; wait_queue_head_t tx_queue, tx_ended;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment