Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5283f5f authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mauro Carvalho Chehab
Browse files

[media] media: rc: nuvoton: remove study states 



Study states have never been used and are not needed. Remove them.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent bdd36bd9

drivers/media/rc/nuvoton-cir.c

+1 −10
Original line number Diff line number Diff line
@@ -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);

drivers/media/rc/nuvoton-cir.h

+0 −13
Original line number Diff line number Diff line
@@ -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