Merge tag 'ceph-for-4.8-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / drivers / media / rc / nuvoton-cir.h

diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
index c9c98eb..acf735f 100644 (file)
--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -104,7 +104,6 @@ struct nvt_dev {
        unsigned long cir_addr;
        unsigned long cir_wake_addr;
        int cir_irq;
-       int cir_wake_irq;
 
        enum nvt_chip_ver chip_ver;
        /* hardware id */
@@ -112,36 +111,12 @@ struct nvt_dev {
        u8 chip_minor;
 
        /* hardware features */
-       bool hw_learning_capable;
        bool hw_tx_capable;
 
-       /* rx settings */
-       bool learning_enabled;
-
-       /* track cir wake state */
-       u8 wake_state;
-       /* 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
-
-/* 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
-#define ST_RX_WAIT_SILENT_END  0x4
-
 /* send states */
 #define ST_TX_NONE     0x0
 #define ST_TX_REQUEST  0x2