openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Heiner Kallweit 2016-06-24 02:39:45 -03:00 committed by Mauro Carvalho Chehab
parent bdd36bd975
commit e5283f5f1f
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/rc/nuvoton-cir.c
View File

@ -865,7 +865,7 @@ static bool nvt_cir_tx_inactive(struct nvt_dev *nvt)
static irqreturn_t nvt_cir_isr(int irq, void *data) static irqreturn_t nvt_cir_isr(int irq, void *data)
{ {
struct nvt_dev *nvt = data; struct nvt_dev *nvt = data;
u8 status, iren, cur_state; u8 status, iren;
unsigned long flags; unsigned long flags;
nvt_dbg_verbose("%s firing", __func__); 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); nvt_handle_rx_fifo_overrun(nvt);
if (status & CIR_IRSTS_RTR) { if (status & CIR_IRSTS_RTR) {
/* FIXME: add code for study/learn mode */
/* We only do rx if not tx'ing */ /* We only do rx if not tx'ing */
if (nvt_cir_tx_inactive(nvt)) if (nvt_cir_tx_inactive(nvt))
nvt_get_rx_ir_data(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 (status & CIR_IRSTS_PE) {
if (nvt_cir_tx_inactive(nvt)) if (nvt_cir_tx_inactive(nvt))
nvt_get_rx_ir_data(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); 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); spin_lock_irqsave(&nvt->nvt_lock, flags);
/* zero out misc state tracking */
nvt->study_state = ST_STUDY_NONE;
/* disable all CIR interrupts */ /* disable all CIR interrupts */
nvt_cir_reg_write(nvt, 0, CIR_IREN); nvt_cir_reg_write(nvt, 0, CIR_IREN);

13
drivers/media/rc/nuvoton-cir.h
View File

@ -117,23 +117,10 @@ struct nvt_dev {
/* rx settings */ /* rx settings */
bool learning_enabled; bool learning_enabled;
/* for study */
u8 study_state;
/* carrier period = 1 / frequency */ /* carrier period = 1 / frequency */
u32 carrier; 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 */ /* send states */
#define ST_TX_NONE 0x0 #define ST_TX_NONE 0x0
#define ST_TX_REQUEST 0x2 #define ST_TX_REQUEST 0x2