Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (9367): Move lgdt3304 driver to the proper place and allow it to compile

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+28 -25
+8
drivers/media/dvb/frontends/Kconfig
··· 345 345 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want 346 346 to support this frontend. 347 347 348 + config DVB_LGDT3304 349 + tristate "LG Electronics LGDT3304" 350 + depends on DVB_CORE && I2C 351 + default m if DVB_FE_CUSTOMISE 352 + help 353 + An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want 354 + to support this frontend. 355 + 348 356 config DVB_S5H1409 349 357 tristate "Samsung S5H1409 based" 350 358 depends on DVB_CORE && I2C
+2
drivers/media/dvb/frontends/Makefile
··· 37 37 obj-$(CONFIG_DVB_BCM3510) += bcm3510.o 38 38 obj-$(CONFIG_DVB_S5H1420) += s5h1420.o 39 39 obj-$(CONFIG_DVB_LGDT330X) += lgdt330x.o 40 + obj-$(CONFIG_DVB_LGDT3304) += lgdt3304.o 40 41 obj-$(CONFIG_DVB_CX24123) += cx24123.o 41 42 obj-$(CONFIG_DVB_LNBP21) += lnbp21.o 42 43 obj-$(CONFIG_DVB_ISL6405) += isl6405.o ··· 59 58 obj-$(CONFIG_DVB_STV0288) += stv0288.o 60 59 obj-$(CONFIG_DVB_STB6000) += stb6000.o 61 60 obj-$(CONFIG_DVB_S921) += s921.o 61 +
-7
drivers/media/video/empia/lgdt3304/Makefile
··· 1 - lgdt3304-demod-objs := lgdt3304.o 2 - 3 - obj-m += lgdt3304-demod.o 4 - 5 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 6 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 7 - EXTRA_CFLAGS += -DCONFIG_DVB_LGDT3304
+18 -18
drivers/media/video/empia/lgdt3304/lgdt3304.c drivers/media/dvb/frontends/lgdt3304.c
··· 20 20 21 21 struct lgdt3304_state 22 22 { 23 - struct dvb_frontend frontend; 24 - fe_modulation_t current_modulation; 25 - __u32 snr; 26 - __u32 current_frequency; 23 + struct dvb_frontend frontend; 24 + fe_modulation_t current_modulation; 25 + __u32 snr; 26 + __u32 current_frequency; 27 27 __u8 addr; 28 28 struct i2c_adapter *i2c; 29 29 }; ··· 37 37 .len = 3, 38 38 .buf = buf 39 39 }; 40 - int i; 41 - int err; 40 + int i; 41 + int err; 42 42 43 - for (i=0; i<len-1; i+=3){ 43 + for (i=0; i<len-1; i+=3){ 44 44 if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) { 45 45 printk("%s i2c_transfer error %d\n", __FUNCTION__, err); 46 - if (err < 0) 47 - return err; 48 - else 49 - return -EREMOTEIO; 50 - } 51 - i2cmsgs.buf += 3; 52 - } 53 - return 0; 46 + if (err < 0) 47 + return err; 48 + else 49 + return -EREMOTEIO; 50 + } 51 + i2cmsgs.buf += 3; 52 + } 53 + return 0; 54 54 } 55 55 56 56 static int lgdt3304_i2c_read_reg(struct dvb_frontend *fe, unsigned int reg) ··· 248 248 lgdt3304_soft_Reset(fe); 249 249 250 250 251 - if (fe->ops.tuner_ops.set_params) 252 - fe->ops.tuner_ops.set_params(fe, param); 251 + if (fe->ops.tuner_ops.set_params) 252 + fe->ops.tuner_ops.set_params(fe, param); 253 253 254 254 return 0; 255 255 } 256 256 257 257 static int lgdt3304_init(struct dvb_frontend *fe) { 258 - return 0; 258 + return 0; 259 259 } 260 260 261 261 static int lgdt3304_sleep(struct dvb_frontend *fe) {
drivers/media/video/empia/lgdt3304/lgdt3304.h drivers/media/dvb/frontends/lgdt3304.h