summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-06-24 02:39:12 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-08 17:14:32 -0300
commitcb359a863ab3534afb2c3487b391a8cd2f59f2d6 (patch)
treec3eb908182c4fc50d50507ca058d94ce8864e33a /drivers/media/rc
parent594ccee6f09bc5253dbeddcc7904f0b7509f00f9 (diff)
downloadlinux-cb359a863ab3534afb2c3487b391a8cd2f59f2d6.tar.bz2
[media] media: rc: nuvoton: remove wake states
Wake states have never been in use and now that we can set the wakeup sequence via sysfs there's in general no need for 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.c1
-rw-r--r--drivers/media/rc/nuvoton-cir.h7
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index c16515f347b9..0aebbdb07579 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1206,7 +1206,6 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state)
/* zero out misc state tracking */
nvt->study_state = ST_STUDY_NONE;
- nvt->wake_state = ST_WAKE_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 68431f062dfc..8bd35bd908dc 100644
--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -117,8 +117,6 @@ struct nvt_dev {
/* rx settings */
bool learning_enabled;
- /* track cir wake state */
- u8 wake_state;
/* for study */
u8 study_state;
/* carrier period = 1 / frequency */
@@ -131,11 +129,6 @@ struct nvt_dev {
#define ST_STUDY_CARRIER 0x2
#define ST_STUDY_ALL_RECV 0x4
-/* wake states */
-#define ST_WAKE_NONE 0x0
-#define ST_WAKE_START 0x1
-#define ST_WAKE_FINISH 0x2
-
/* receive states */
#define ST_RX_WAIT_7F 0x1
#define ST_RX_WAIT_HEAD 0x2