diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-06-24 02:39:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-08 17:17:47 -0300 |
| commit | e5283f5f1f0c8bf2336a07b44beb4c2bdc2db825 (patch) | |
| tree | 69fb18a71c4d7a3fc4e9ce12a42083fd2e2f3fae /drivers/media/rc | |
| parent | bdd36bd975a8a8adbbcbffdfc25c1fb71088861d (diff) | |
| download | blackbird-op-linux-e5283f5f1f0c8bf2336a07b44beb4c2bdc2db825.tar.gz blackbird-op-linux-e5283f5f1f0c8bf2336a07b44beb4c2bdc2db825.zip | |
[media] media: rc: nuvoton: remove study states
Study states have never been used and are not needed. Remove them.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc')
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.c | 11 | ||||
| -rw-r--r-- | drivers/media/rc/nuvoton-cir.h | 13 |
2 files changed, 1 insertions, 23 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c index a60ea2d3d4d7..270a687b47a2 100644 --- a/drivers/media/rc/nuvoton-cir.c +++ b/drivers/media/rc/nuvoton-cir.c @@ -865,7 +865,7 @@ static bool nvt_cir_tx_inactive(struct nvt_dev *nvt) static irqreturn_t nvt_cir_isr(int irq, void *data) { struct nvt_dev *nvt = data; - u8 status, iren, cur_state; + u8 status, iren; unsigned long flags; nvt_dbg_verbose("%s firing", __func__); @@ -907,7 +907,6 @@ static irqreturn_t nvt_cir_isr(int irq, void *data) nvt_handle_rx_fifo_overrun(nvt); if (status & CIR_IRSTS_RTR) { - /* FIXME: add code for study/learn mode */ /* We only do rx if not tx'ing */ if (nvt_cir_tx_inactive(nvt)) nvt_get_rx_ir_data(nvt); @@ -916,11 +915,6 @@ static irqreturn_t nvt_cir_isr(int irq, void *data) if (status & CIR_IRSTS_PE) { if (nvt_cir_tx_inactive(nvt)) nvt_get_rx_ir_data(nvt); - - cur_state = nvt->study_state; - - if (cur_state == ST_STUDY_NONE) - nvt_clear_cir_fifo(nvt); } spin_unlock_irqrestore(&nvt->nvt_lock, flags); @@ -1192,9 +1186,6 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state) spin_lock_irqsave(&nvt->nvt_lock, flags); - /* zero out misc state tracking */ - nvt->study_state = ST_STUDY_NONE; - /* disable all CIR interrupts */ nvt_cir_reg_write(nvt, 0, CIR_IREN); diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h index 8bd35bd908dc..65324ef2f5c4 100644 --- a/drivers/media/rc/nuvoton-cir.h +++ b/drivers/media/rc/nuvoton-cir.h @@ -117,23 +117,10 @@ struct nvt_dev { /* rx settings */ bool learning_enabled; - /* for study */ - u8 study_state; /* carrier period = 1 / frequency */ u32 carrier; }; -/* study states */ -#define ST_STUDY_NONE 0x0 -#define ST_STUDY_START 0x1 -#define ST_STUDY_CARRIER 0x2 -#define ST_STUDY_ALL_RECV 0x4 - -/* receive states */ -#define ST_RX_WAIT_7F 0x1 -#define ST_RX_WAIT_HEAD 0x2 -#define ST_RX_WAIT_SILENT_END 0x4 - /* send states */ #define ST_TX_NONE 0x0 #define ST_TX_REQUEST 0x2 |
