diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2008-04-12 14:04:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:39 -0400 |
commit | 1881ee89e0fe03ac5bba9045acb3bea1818f9466 (patch) | |
tree | 6f19074842f90d0dc7aaa46aac4d60d409de077e /drivers/media/dvb/frontends | |
parent | dbad108bdcb30629c850f5606949510da010a686 (diff) |
V4L/DVB (7571): mt312: Cleanup buffer variables of read/write functions
Change type of buffer variables from void* to u8* to save some casts.
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends')
-rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 5 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/mt312.c | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 0209644f222a..4284a3092c14 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig | |||
@@ -369,6 +369,11 @@ config DVB_TUNER_XC5000 | |||
369 | This device is only used inside a SiP called togther with a | 369 | This device is only used inside a SiP called togther with a |
370 | demodulator for now. | 370 | demodulator for now. |
371 | 371 | ||
372 | config DVB_TUNER_ITD1000 | ||
373 | tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS" | ||
374 | depends on DVB_CORE && I2C | ||
375 | default m if DVB_FE_CUSTOMISE | ||
376 | |||
372 | comment "Miscellaneous devices" | 377 | comment "Miscellaneous devices" |
373 | depends on DVB_CORE | 378 | depends on DVB_CORE |
374 | 379 | ||
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index 23304b3774b5..129367886bcc 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile | |||
@@ -52,3 +52,4 @@ obj-$(CONFIG_DVB_TUA6100) += tua6100.o | |||
52 | obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o | 52 | obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o |
53 | obj-$(CONFIG_DVB_S5H1409) += s5h1409.o | 53 | obj-$(CONFIG_DVB_S5H1409) += s5h1409.o |
54 | obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o | 54 | obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o |
55 | obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o | ||
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index daca855c804a..b03a959ef2e8 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -58,7 +58,7 @@ static int debug; | |||
58 | #define MT312_PLL_CLK 10000000UL /* 10 MHz */ | 58 | #define MT312_PLL_CLK 10000000UL /* 10 MHz */ |
59 | 59 | ||
60 | static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, | 60 | static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, |
61 | void *buf, const size_t count) | 61 | u8 *buf, const size_t count) |
62 | { | 62 | { |
63 | int ret; | 63 | int ret; |
64 | struct i2c_msg msg[2]; | 64 | struct i2c_msg msg[2]; |
@@ -84,7 +84,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, | |||
84 | int i; | 84 | int i; |
85 | dprintk("R(%d):", reg & 0x7f); | 85 | dprintk("R(%d):", reg & 0x7f); |
86 | for (i = 0; i < count; i++) | 86 | for (i = 0; i < count; i++) |
87 | printk(" %02x", ((const u8 *) buf)[i]); | 87 | printk(" %02x", buf[i]); |
88 | printk("\n"); | 88 | printk("\n"); |
89 | } | 89 | } |
90 | 90 | ||
@@ -92,7 +92,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, | |||
92 | } | 92 | } |
93 | 93 | ||
94 | static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, | 94 | static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, |
95 | const void *src, const size_t count) | 95 | const u8 *src, const size_t count) |
96 | { | 96 | { |
97 | int ret; | 97 | int ret; |
98 | u8 buf[count + 1]; | 98 | u8 buf[count + 1]; |
@@ -102,7 +102,7 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, | |||
102 | int i; | 102 | int i; |
103 | dprintk("W(%d):", reg & 0x7f); | 103 | dprintk("W(%d):", reg & 0x7f); |
104 | for (i = 0; i < count; i++) | 104 | for (i = 0; i < count; i++) |
105 | printk(" %02x", ((const u8 *) src)[i]); | 105 | printk(" %02x", src[i]); |
106 | printk("\n"); | 106 | printk("\n"); |
107 | } | 107 | } |
108 | 108 | ||
@@ -463,7 +463,7 @@ static int mt312_read_snr(struct dvb_frontend *fe, u16 *snr) | |||
463 | int ret; | 463 | int ret; |
464 | u8 buf[2]; | 464 | u8 buf[2]; |
465 | 465 | ||
466 | ret = mt312_read(state, M_SNR_H, &buf, sizeof(buf)); | 466 | ret = mt312_read(state, M_SNR_H, buf, sizeof(buf)); |
467 | if (ret < 0) | 467 | if (ret < 0) |
468 | return ret; | 468 | return ret; |
469 | 469 | ||
@@ -478,7 +478,7 @@ static int mt312_read_ucblocks(struct dvb_frontend *fe, u32 *ubc) | |||
478 | int ret; | 478 | int ret; |
479 | u8 buf[2]; | 479 | u8 buf[2]; |
480 | 480 | ||
481 | ret = mt312_read(state, RS_UBC_H, &buf, sizeof(buf)); | 481 | ret = mt312_read(state, RS_UBC_H, buf, sizeof(buf)); |
482 | if (ret < 0) | 482 | if (ret < 0) |
483 | return ret; | 483 | return ret; |
484 | 484 | ||