Signed-off-by: Antti Palosaari <crope@xxxxxx>
---
drivers/media/tuners/it913x.c | 24 ++++++++++++------------
drivers/media/tuners/it913x_priv.h | 10 +---------
2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 6ae9d5a..1cb9709 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -156,22 +156,22 @@ static int it913x_init(struct dvb_frontend *fe)
/* LNA Scripts */
switch (state->tuner_type) {
- case IT9135_51:
+ case AF9033_TUNER_IT9135_51:
set_lna = it9135_51;
break;
- case IT9135_52:
+ case AF9033_TUNER_IT9135_52:
set_lna = it9135_52;
break;
- case IT9135_60:
+ case AF9033_TUNER_IT9135_60:
set_lna = it9135_60;
break;
- case IT9135_61:
+ case AF9033_TUNER_IT9135_61:
set_lna = it9135_61;
break;
- case IT9135_62:
+ case AF9033_TUNER_IT9135_62:
set_lna = it9135_62;
break;
- case IT9135_38:
+ case AF9033_TUNER_IT9135_38:
default:
set_lna = it9135_38;
}
@@ -444,14 +444,14 @@ struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
state->i2c_addr = i2c_addr;
switch (config) {
- case IT9135_38:
- case IT9135_51:
- case IT9135_52:
+ case AF9033_TUNER_IT9135_38:
+ case AF9033_TUNER_IT9135_51:
+ case AF9033_TUNER_IT9135_52:
state->chip_ver = 0x01;
break;
- case IT9135_60:
- case IT9135_61:
- case IT9135_62:
+ case AF9033_TUNER_IT9135_60:
+ case AF9033_TUNER_IT9135_61:
+ case AF9033_TUNER_IT9135_62:
state->chip_ver = 0x02;
break;
default:
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 315ff6c..1491bf8 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -24,15 +24,7 @@
#define IT913X_PRIV_H
#include "it913x.h"
-
-/* Build in tuner types */
-#define IT9137 0x38
-#define IT9135_38 0x38
-#define IT9135_51 0x51
-#define IT9135_52 0x52
-#define IT9135_60 0x60
-#define IT9135_61 0x61
-#define IT9135_62 0x62
+#include "af9033.h"
#define PRO_LINK 0x0
#define PRO_DMOD 0x1
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
