V4L/DVB fixes
Subsystems (2)
cover V4L/DVB fixes
Linus,
Please pull 'master' from:
git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master
It contains the following:
- Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
- DVB: Add DVB_FE_CUSTOMISE support for MT2060
Those two patches fixes the known regression at dvb, related to breakage of building system, on some unusual config selections.
- Pvrusb2: use NULL instead of 0
This fixes compilation warnings
- Budget-ci: Change DEBIADDR_IR to a safer default
- Budget-ci: Inversion setting fixed for Technotrend 1500 T
- Fix mode switch of Compro Videomate T300
- [saa7146_i2c] short_delay mode fixed for fast machines Those fixes some troubles for some specific boards.
Cheers,
Mauro.
V4L/DVB development is hosted at http://linuxtv.org
---
drivers/media/common/saa7146_i2c.c | 10 ++++------ drivers/media/dvb/dvb-usb/Kconfig | 12 ++++++------ drivers/media/dvb/frontends/Kconfig | 2 ++ drivers/media/dvb/frontends/bcm3510.h | 2 +- drivers/media/dvb/frontends/cx22700.h | 2 +- drivers/media/dvb/frontends/cx22702.h | 2 +- drivers/media/dvb/frontends/cx24110.h | 2 +- drivers/media/dvb/frontends/cx24123.h | 2 +- drivers/media/dvb/frontends/dib3000.h | 2 +- drivers/media/dvb/frontends/dib3000mc.h | 2 +- drivers/media/dvb/frontends/isl6421.h | 2 +- drivers/media/dvb/frontends/l64781.h | 2 +- drivers/media/dvb/frontends/lgdt330x.h | 2 +- drivers/media/dvb/frontends/lnbp21.h | 2 +- drivers/media/dvb/frontends/mt2060.h | 8 ++++++++ drivers/media/dvb/frontends/mt312.h | 2 +- drivers/media/dvb/frontends/mt352.h | 2 +- drivers/media/dvb/frontends/nxt200x.h | 2 +- drivers/media/dvb/frontends/nxt6000.h | 2 +- drivers/media/dvb/frontends/or51132.h | 2 +- drivers/media/dvb/frontends/or51211.h | 2 +- drivers/media/dvb/frontends/s5h1420.h | 2 +- drivers/media/dvb/frontends/sp8870.h | 2 +- drivers/media/dvb/frontends/sp887x.h | 2 +- drivers/media/dvb/frontends/stv0297.h | 2 +- drivers/media/dvb/frontends/stv0299.h | 2 +- drivers/media/dvb/frontends/tda10021.h | 2 +- drivers/media/dvb/frontends/tda1004x.h | 2 +- drivers/media/dvb/frontends/tda10086.h | 2 +- drivers/media/dvb/frontends/tda8083.h | 2 +- drivers/media/dvb/frontends/tda826x.h | 2 +- drivers/media/dvb/frontends/tua6100.h | 2 +- drivers/media/dvb/frontends/ves1820.h | 2 +- drivers/media/dvb/frontends/ves1x93.h | 2 +- drivers/media/dvb/frontends/zl10353.h | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 10 +++++++++- drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +++--- drivers/media/video/saa7134/saa7134-dvb.c | 2 ++ 39 files changed, 66 insertions(+), 48 deletions(-)
PATCH 1/7 V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060
From: Trent Piepho <[email protected]>
Let the MT2060 be customized like most of the other DVB PLLs/front-ends. Also, add a missing dependency on I2C.
---
drivers/media/dvb/dvb-usb/Kconfig | 12 ++++++------ drivers/media/dvb/frontends/Kconfig | 2 ++ drivers/media/dvb/frontends/mt2060.h | 8 ++++++++ 3 files changed, 16 insertions(+), 6 deletions(-)
drivers/media/dvb/dvb-usb/Kconfig +6 -6
@@ -26,7 +26,7 @@ config DVB_USB_A800 tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)" depends on DVB_USB select DVB_DIB3000MC - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)" depends on DVB_USB select DVB_DIB3000MB - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)" depends on DVB_USB select DVB_DIB3000MC - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Support for USB2.0 DVB-T receivers based on reference designs made by DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -70,7 +70,7 @@ config DVB_USB_DIB0700 tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)" depends on DVB_USB select DVB_DIB3000MC - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The USB bridge is also present in devices having the DiB7700 DVB-T-USB
@@ -87,7 +87,7 @@ config DVB_USB_UMT_010 tristate "HanfTek UMT-010 DVB-T USB2.0 support" depends on DVB_USB select DVB_DIB3000MC - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
@@ -153,7 +153,7 @@ config DVB_USB_NOVA_T_USB2 tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support" depends on DVB_USB select DVB_DIB3000MC - select DVB_TUNER_MT2060 + select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE help Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
drivers/media/dvb/frontends/Kconfig +2 -0
@@ -276,6 +276,8 @@ config DVB_TDA826X config DVB_TUNER_MT2060 tristate "Microtune MT2060 silicon IF tuner" + depends on I2C + default m if DVB_FE_CUSTOMISE help A driver for the silicon IF tuner MT2060 from Microtune.
drivers/media/dvb/frontends/mt2060.h +8 -0
@@ -30,6 +30,14 @@ struct mt2060_config { u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */ }; +#if defined(CONFIG_DVB_TUNER_MT2060 ) || (defined(CONFIG_DVB_TUNER_MT2060_MODULE ) && defined(MODULE ))extern struct dvb_frontend *mt2060_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct mt2060_config *cfg,u16 if1); +#else +static inline struct dvb_frontend *mt2060_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct mt2060_config *cfg,u16 if1) +{ +printk (KERN_WARNING "%s: driver disabled by Kconfig\n" , __FUNCTION__); +return NULL ; +} +#endif // CONFIG_DVB_TUNER_MT2060 #endif
PATCH 2/7 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
In reply to [email protected]From: David H�rdeman <[email protected]>
The IR chip has no address decoding, so the IR data is always present in the high byte when doing a read from the saa7146 chip. This means that the DEBI address used is irrelevant to the IR decoding logic. DEBI addresses 0x1XXX are mapped to the registers on the CI module itself, but only the lowest two bits are actually used (see EN50221, section A.2.2.1), meaning that 0x1234 is equivalent to 0x1000 which maps to register 0 (the data register). A read from the data register is supposed to be preceded by a read from the size register, so some CI modules will be confused (the AlphaCrypt CAM will hang completely). The attached patch changes the address used when reading the IR data to use 0x4000 instead. This is the CI version address, which is a safer default, works with the AlphaCrypt CAM and matches the behaviour of the Windows driver (AFAIK).
---
drivers/media/dvb/ttpci/budget-ci.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
drivers/media/dvb/ttpci/budget-ci.c +8 -1
@@ -46,7 +46,14 @@ #include "lnbp21.h"#include "bsbe1.h" #include "bsru6.h" -#define DEBIADDR_IR 0x1234 +/* +* Regarding DEBIADDR_IR: +* Some CI modules hang if random addresses are read. +* Using address 0x4000 for the IR read means that we +* use the same address as for CI version, which should +* be a safe default. +*/ +#define DEBIADDR_IR 0x4000#define DEBIADDR_CICONTROL 0x0000#define DEBIADDR_CIVERSION 0x4000#define DEBIADDR_IO 0x1000
PATCH 3/7 V4L/DVB (4786): Pvrusb2: use NULL instead of 0
In reply to [email protected]From: Randy Dunlap <[email protected]>
Fix sparse NULL usage warnings:drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer
---
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +1 -1
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(strstatic void decoder_reset (struct pvr2_v4l_cx2584x *ctxt) {int ret; - ret =pvr2_i2c_client_cmd (ctxt->client,VIDIOC_INT_RESET ,0 ); + ret =pvr2_i2c_client_cmd (ctxt->client,VIDIOC_INT_RESET ,NULL );pvr2_trace (PVR2_TRACE_CHIPS ,"i2c cx25840 decoder_reset (ret=%d)" ,ret); }
drivers/media/video/pvrusb2/pvrusb2-v4l2.c +3 -3
@@ -711,8 +711,8 @@ static void pvr2_v4l2_dev_destroy(struct dip->devbase.minor,pvr2_config_get_name(dip->config));/* Paranoia */ - dip->v4lp =0 ; - dip->stream =0 ; + dip->v4lp =NULL ; + dip->stream =NULL ;/* Actual deallocation happens later when all internal references are gone. */
@@ -1076,7 +1076,7 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struc vp->vdev =kmalloc (sizeof (*vp->vdev),GFP_KERNEL );if (!vp->vdev) {kfree (vp); -return 0 ; +return NULL ; }memset (vp->vdev,0 ,sizeof (*vp->vdev));pvr2_channel_init (&vp->channel,mnp);
PATCH 4/7 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
In reply to [email protected]From: Raymond Mantchala <[email protected]>
Technotrend 1500 T card have "inverted inversion". This patch fixes that. Many thanks to Martin Zwickel from Technotrend for his confirmation and correction proposal.
---
drivers/media/dvb/ttpci/budget-ci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/dvb/ttpci/budget-ci.c +1 -0
@@ -1035,6 +1035,7 @@ static void frontend_init(struct budget_case 0x1012 :// TT DVB-T CI budget (tda10046/Philips tdm1316l(tda6651tt)) budget_ci->tuner_pll_address =0x60 ; + philips_tdm1316l_config.invert =1 ; budget_ci->budget.dvb_frontend =dvb_attach (tda10046_attach, &philips_tdm1316l_config, &budget_ci->budget.i2c_adap);if (budget_ci->budget.dvb_frontend) {
PATCH 5/7 V4L/DVB (4770): Fix mode switch of Compro Videomate T300
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
The board did not return to analog mode since the board specific "demod sleep" function was not called.
---
drivers/media/video/saa7134/saa7134-dvb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/media/video/saa7134/saa7134-dvb.c +2 -0
@@ -1147,6 +1147,8 @@ static int dvb_init(struct saa7134_dev * &philips_europa_config, &dev->i2c_adap);if (dev->dvb.frontend) { + dev->original_demod_sleep = dev->dvb.frontend->ops.sleep; + dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep; dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init; dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
PATCH 6/7 V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
In reply to [email protected]From: Oliver Endriss <[email protected]>
TT DVB-C 2300 runs at 137 kHz I2C speed. short_delay mode did not work reliably on fast machines with that speed. Increased max loop count from 20 to 50. Moved dummy access out of the loop.
---
drivers/media/common/saa7146_i2c.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/media/common/saa7146_i2c.c +4 -6
@@ -217,11 +217,9 @@ static int saa7146_i2c_writeout(struct s }/* wait until we get a transfer done or error */ timeout = jiffies +HZ /100 +1 ;/* 10ms */ +/* first read usually delivers bogus results... */ +saa7146_i2c_status (dev);while (1 ) { -/** -* first read usually delivers bogus results... -*/ -saa7146_i2c_status (dev); status =saa7146_i2c_status (dev);if ((status &0x3 ) !=1 )break ;
@@ -232,10 +230,10 @@ static int saa7146_i2c_writeout(struct sDEB_I2C (("saa7146_i2c_writeout: timed out waiting for end of xfer\n" ));return -EIO ; } -if ((++trial <20 ) && short_delay) +if (++trial <50 && short_delay)udelay (10 );else -msleep (1 ); +msleep (1 ); } }
PATCH 7/7 V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
In reply to [email protected]From: Trent Piepho <[email protected]>
When a front-end is disabled, card drivers that use it are compiled with a stub version of the front-end's attach function. This way they have no references to the front-end's code and don't need it to be loaded. If a card driver is compiled into the kernel, and a front-end is a module, then that front-end is effectively disabled wrt the card driver. In this case, the card driver should get the stub version. This was not happening.
The stub vs real attach function selection is changed so that when the front-end is a module the real attach function is only used if the card driver is a module as well. This means a module front-end will be supported by card drivers that are modules and not supported by card drivers compiled into the kernel.
---
drivers/media/dvb/frontends/bcm3510.h | 2 +- drivers/media/dvb/frontends/cx22700.h | 2 +- drivers/media/dvb/frontends/cx22702.h | 2 +- drivers/media/dvb/frontends/cx24110.h | 2 +- drivers/media/dvb/frontends/cx24123.h | 2 +- drivers/media/dvb/frontends/dib3000.h | 2 +- drivers/media/dvb/frontends/dib3000mc.h | 2 +- drivers/media/dvb/frontends/isl6421.h | 2 +- drivers/media/dvb/frontends/l64781.h | 2 +- drivers/media/dvb/frontends/lgdt330x.h | 2 +- drivers/media/dvb/frontends/lnbp21.h | 2 +- drivers/media/dvb/frontends/mt312.h | 2 +- drivers/media/dvb/frontends/mt352.h | 2 +- drivers/media/dvb/frontends/nxt200x.h | 2 +- drivers/media/dvb/frontends/nxt6000.h | 2 +- drivers/media/dvb/frontends/or51132.h | 2 +- drivers/media/dvb/frontends/or51211.h | 2 +- drivers/media/dvb/frontends/s5h1420.h | 2 +- drivers/media/dvb/frontends/sp8870.h | 2 +- drivers/media/dvb/frontends/sp887x.h | 2 +- drivers/media/dvb/frontends/stv0297.h | 2 +- drivers/media/dvb/frontends/stv0299.h | 2 +- drivers/media/dvb/frontends/tda10021.h | 2 +- drivers/media/dvb/frontends/tda1004x.h | 2 +- drivers/media/dvb/frontends/tda10086.h | 2 +- drivers/media/dvb/frontends/tda8083.h | 2 +- drivers/media/dvb/frontends/tda826x.h | 2 +- drivers/media/dvb/frontends/tua6100.h | 2 +- drivers/media/dvb/frontends/ves1820.h | 2 +- drivers/media/dvb/frontends/ves1x93.h | 2 +- drivers/media/dvb/frontends/zl10353.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-)
drivers/media/dvb/frontends/bcm3510.h +1 -1
@@ -34,7 +34,7 @@ struct bcm3510_configint (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); }; -#if defined(CONFIG_DVB_BCM3510 ) || defined(CONFIG_DVB_BCM3510_MODULE ) +#if defined(CONFIG_DVB_BCM3510 ) || (defined(CONFIG_DVB_BCM3510_MODULE ) && defined(MODULE ))extern struct dvb_frontend *bcm3510_attach (const struct bcm3510_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/cx22700.h +1 -1
@@ -31,7 +31,7 @@ struct cx22700_configu8 demod_address; }; -#if defined(CONFIG_DVB_CX22700 ) || defined(CONFIG_DVB_CX22700_MODULE ) +#if defined(CONFIG_DVB_CX22700 ) || (defined(CONFIG_DVB_CX22700_MODULE ) && defined(MODULE ))extern struct dvb_frontend *cx22700_attach (const struct cx22700_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/cx22702.h +1 -1
@@ -41,7 +41,7 @@ #define CX22702_SERIAL_OUTPUT 1u8 output_mode; }; -#if defined(CONFIG_DVB_CX22702 ) || defined(CONFIG_DVB_CX22702_MODULE ) +#if defined(CONFIG_DVB_CX22702 ) || (defined(CONFIG_DVB_CX22702_MODULE ) && defined(MODULE ))extern struct dvb_frontend *cx22702_attach (const struct cx22702_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/cx24110.h +1 -1
@@ -41,7 +41,7 @@ static inline int cx24110_pll_write(strureturn r; } -#if defined(CONFIG_DVB_CX24110 ) || defined(CONFIG_DVB_CX24110_MODULE ) +#if defined(CONFIG_DVB_CX24110 ) || (defined(CONFIG_DVB_CX24110_MODULE ) && defined(MODULE ))extern struct dvb_frontend *cx24110_attach (const struct cx24110_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/cx24123.h +1 -1
@@ -35,7 +35,7 @@ struct cx24123_configint lnb_polarity; }; -#if defined(CONFIG_DVB_CX24123 ) || defined(CONFIG_DVB_CX24123_MODULE ) +#if defined(CONFIG_DVB_CX24123 ) || (defined(CONFIG_DVB_CX24123_MODULE ) && defined(MODULE ))extern struct dvb_frontend *cx24123_attach (const struct cx24123_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/dib3000.h +1 -1
@@ -41,7 +41,7 @@ struct dib_fe_xfer_opsint (*tuner_pass_ctrl)(struct dvb_frontend *fe,int onoff,u8 pll_ctrl); }; -#if defined(CONFIG_DVB_DIB3000MB ) || defined(CONFIG_DVB_DIB3000MB_MODULE ) +#if defined(CONFIG_DVB_DIB3000MB ) || (defined(CONFIG_DVB_DIB3000MB_MODULE ) && defined(MODULE ))extern struct dvb_frontend *dib3000mb_attach (const struct dib3000_config * config,struct i2c_adapter * i2c,struct dib_fe_xfer_ops *xfer_ops);#else
drivers/media/dvb/frontends/dib3000mc.h +1 -1
@@ -39,7 +39,7 @@ struct dib3000mc_config {#define DEFAULT_DIB3000MC_I2C_ADDRESS 16#define DEFAULT_DIB3000P_I2C_ADDRESS 24 -#if defined(CONFIG_DVB_DIB3000MC ) || defined(CONFIG_DVB_DIB3000MC_MODULE ) +#if defined(CONFIG_DVB_DIB3000MC ) || (defined(CONFIG_DVB_DIB3000MC_MODULE ) && defined(MODULE ))extern struct dvb_frontend *dib3000mc_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct dib3000mc_config *cfg);#else static inline struct dvb_frontend *dib3000mc_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct dib3000mc_config *cfg)
drivers/media/dvb/frontends/isl6421.h +1 -1
@@ -39,7 +39,7 @@ #define ISL6421_ENT1 0x10#define ISL6421_ISEL1 0x20#define ISL6421_DCL 0x40 -#if defined(CONFIG_DVB_ISL6421 ) || defined(CONFIG_DVB_ISL6421_MODULE ) +#if defined(CONFIG_DVB_ISL6421 ) || (defined(CONFIG_DVB_ISL6421_MODULE ) && defined(MODULE ))/* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *isl6421_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,u8 i2c_addr,u8 override_set,u8 override_clear);
drivers/media/dvb/frontends/l64781.h +1 -1
@@ -31,7 +31,7 @@ struct l64781_configu8 demod_address; }; -#if defined(CONFIG_DVB_L64781 ) || defined(CONFIG_DVB_L64781_MODULE ) +#if defined(CONFIG_DVB_L64781 ) || (defined(CONFIG_DVB_L64781_MODULE ) && defined(MODULE ))extern struct dvb_frontend *l64781_attach (const struct l64781_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/lgdt330x.h +1 -1
@@ -52,7 +52,7 @@ struct lgdt330x_configint clock_polarity_flip; }; -#if defined(CONFIG_DVB_LGDT330X ) || defined(CONFIG_DVB_LGDT330X_MODULE ) +#if defined(CONFIG_DVB_LGDT330X ) || (defined(CONFIG_DVB_LGDT330X_MODULE ) && defined(MODULE ))extern struct dvb_frontend *lgdt330x_attach (const struct lgdt330x_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/lnbp21.h +1 -1
@@ -39,7 +39,7 @@ #define LNBP21_PCL 0x80#include <linux/dvb/frontend.h> -#if defined(CONFIG_DVB_LNBP21 ) || defined(CONFIG_DVB_LNBP21_MODULE ) +#if defined(CONFIG_DVB_LNBP21 ) || (defined(CONFIG_DVB_LNBP21_MODULE ) && defined(MODULE ))/* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *lnbp21_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,u8 override_set,u8 override_clear);#else
drivers/media/dvb/frontends/mt312.h +1 -1
@@ -34,7 +34,7 @@ struct mt312_configu8 demod_address; }; -#if defined(CONFIG_DVB_MT312 ) || defined(CONFIG_DVB_MT312_MODULE ) +#if defined(CONFIG_DVB_MT312 ) || (defined(CONFIG_DVB_MT312_MODULE ) && defined(MODULE ))struct dvb_frontend *vp310_mt312_attach (const struct mt312_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/mt352.h +1 -1
@@ -51,7 +51,7 @@ struct mt352_configint (*demod_init)(struct dvb_frontend * fe); }; -#if defined(CONFIG_DVB_MT352 ) || defined(CONFIG_DVB_MT352_MODULE ) +#if defined(CONFIG_DVB_MT352 ) || (defined(CONFIG_DVB_MT352_MODULE ) && defined(MODULE ))extern struct dvb_frontend *mt352_attach (const struct mt352_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/nxt200x.h +1 -1
@@ -45,7 +45,7 @@ struct nxt200x_configint (*set_ts_params)(struct dvb_frontend * fe,int is_punctured); }; -#if defined(CONFIG_DVB_NXT200X ) || defined(CONFIG_DVB_NXT200X_MODULE ) +#if defined(CONFIG_DVB_NXT200X ) || (defined(CONFIG_DVB_NXT200X_MODULE ) && defined(MODULE ))extern struct dvb_frontend *nxt200x_attach (const struct nxt200x_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/nxt6000.h +1 -1
@@ -33,7 +33,7 @@ struct nxt6000_config u8 clock_inversion:1; }; -#if defined(CONFIG_DVB_NXT6000 ) || defined(CONFIG_DVB_NXT6000_MODULE ) +#if defined(CONFIG_DVB_NXT6000 ) || (defined(CONFIG_DVB_NXT6000_MODULE ) && defined(MODULE ))extern struct dvb_frontend *nxt6000_attach (const struct nxt6000_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/or51132.h +1 -1
@@ -34,7 +34,7 @@ struct or51132_configint (*set_ts_params)(struct dvb_frontend * fe,int is_punctured); }; -#if defined(CONFIG_DVB_OR51132 ) || defined(CONFIG_DVB_OR51132_MODULE ) +#if defined(CONFIG_DVB_OR51132 ) || (defined(CONFIG_DVB_OR51132_MODULE ) && defined(MODULE ))extern struct dvb_frontend *or51132_attach (const struct or51132_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/or51211.h +1 -1
@@ -37,7 +37,7 @@ struct or51211_configvoid (*sleep)(struct dvb_frontend * fe); }; -#if defined(CONFIG_DVB_OR51211 ) || defined(CONFIG_DVB_OR51211_MODULE ) +#if defined(CONFIG_DVB_OR51211 ) || (defined(CONFIG_DVB_OR51211_MODULE ) && defined(MODULE ))extern struct dvb_frontend *or51211_attach (const struct or51211_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/s5h1420.h +1 -1
@@ -34,7 +34,7 @@ struct s5h1420_config u8 invert:1; }; -#if defined(CONFIG_DVB_S5H1420 ) || defined(CONFIG_DVB_S5H1420_MODULE ) +#if defined(CONFIG_DVB_S5H1420 ) || (defined(CONFIG_DVB_S5H1420_MODULE ) && defined(MODULE ))extern struct dvb_frontend *s5h1420_attach (const struct s5h1420_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/sp8870.h +1 -1
@@ -35,7 +35,7 @@ struct sp8870_configint (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); }; -#if defined(CONFIG_DVB_SP8870 ) || defined(CONFIG_DVB_SP8870_MODULE ) +#if defined(CONFIG_DVB_SP8870 ) || (defined(CONFIG_DVB_SP8870_MODULE ) && defined(MODULE ))extern struct dvb_frontend *sp8870_attach (const struct sp8870_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/sp887x.h +1 -1
@@ -17,7 +17,7 @@ struct sp887x_configint (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); }; -#if defined(CONFIG_DVB_SP887X ) || defined(CONFIG_DVB_SP887X_MODULE ) +#if defined(CONFIG_DVB_SP887X ) || (defined(CONFIG_DVB_SP887X_MODULE ) && defined(MODULE ))extern struct dvb_frontend *sp887x_attach (const struct sp887x_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/stv0297.h +1 -1
@@ -42,7 +42,7 @@ struct stv0297_config u8 stop_during_read:1; }; -#if defined(CONFIG_DVB_STV0297 ) || defined(CONFIG_DVB_STV0297_MODULE ) +#if defined(CONFIG_DVB_STV0297 ) || (defined(CONFIG_DVB_STV0297_MODULE ) && defined(MODULE ))extern struct dvb_frontend *stv0297_attach (const struct stv0297_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/stv0299.h +1 -1
@@ -89,7 +89,7 @@ struct stv0299_configint (*set_symbol_rate)(struct dvb_frontend * fe,u32 srate,u32 ratio); }; -#if defined(CONFIG_DVB_STV0299 ) || defined(CONFIG_DVB_STV0299_MODULE ) +#if defined(CONFIG_DVB_STV0299 ) || (defined(CONFIG_DVB_STV0299_MODULE ) && defined(MODULE ))extern struct dvb_frontend *stv0299_attach (const struct stv0299_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/tda10021.h +1 -1
@@ -32,7 +32,7 @@ struct tda10021_configu8 demod_address; }; -#if defined(CONFIG_DVB_TDA10021 ) || defined(CONFIG_DVB_TDA10021_MODULE ) +#if defined(CONFIG_DVB_TDA10021 ) || (defined(CONFIG_DVB_TDA10021_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tda10021_attach (const struct tda10021_config * config,struct i2c_adapter * i2c,u8 pwm);#else
drivers/media/dvb/frontends/tda1004x.h +1 -1
@@ -71,7 +71,7 @@ struct tda1004x_configint (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); }; -#if defined(CONFIG_DVB_TDA1004X ) || defined(CONFIG_DVB_TDA1004X_MODULE ) +#if defined(CONFIG_DVB_TDA1004X ) || (defined(CONFIG_DVB_TDA1004X_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tda10045_attach (const struct tda1004x_config * config,struct i2c_adapter * i2c);
drivers/media/dvb/frontends/tda10086.h +1 -1
@@ -35,7 +35,7 @@ struct tda10086_configu8 invert; }; -#if defined(CONFIG_DVB_TDA10086 ) || defined(CONFIG_DVB_TDA10086_MODULE ) +#if defined(CONFIG_DVB_TDA10086 ) || (defined(CONFIG_DVB_TDA10086_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tda10086_attach (const struct tda10086_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/tda8083.h +1 -1
@@ -35,7 +35,7 @@ struct tda8083_configu8 demod_address; }; -#if defined(CONFIG_DVB_TDA8083 ) || defined(CONFIG_DVB_TDA8083_MODULE ) +#if defined(CONFIG_DVB_TDA8083 ) || (defined(CONFIG_DVB_TDA8083_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tda8083_attach (const struct tda8083_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/tda826x.h +1 -1
@@ -35,7 +35,7 @@ #include "dvb_frontend.h"* @param has_loopthrough Set to 1 if the card has a loopthrough RF connector. * @return FE pointer on success, NULL on failure. */ -#if defined(CONFIG_DVB_TDA826X ) || defined(CONFIG_DVB_TDA826X_MODULE ) +#if defined(CONFIG_DVB_TDA826X ) || (defined(CONFIG_DVB_TDA826X_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tda826x_attach (struct dvb_frontend *fe,int addr,struct i2c_adapter *i2c,int has_loopthrough);
drivers/media/dvb/frontends/tua6100.h +1 -1
@@ -34,7 +34,7 @@ #define __DVB_TUA6100_H__#include <linux/i2c.h> #include "dvb_frontend.h" -#if defined(CONFIG_DVB_TUA6100 ) || defined(CONFIG_DVB_TUA6100_MODULE ) +#if defined(CONFIG_DVB_TUA6100 ) || (defined(CONFIG_DVB_TUA6100_MODULE ) && defined(MODULE ))extern struct dvb_frontend *tua6100_attach (struct dvb_frontend *fe,int addr,struct i2c_adapter *i2c);#else static inline struct dvb_frontend *tua6100_attach (struct dvb_frontend *fe,int addr,struct i2c_adapter *i2c)
drivers/media/dvb/frontends/ves1820.h +1 -1
@@ -41,7 +41,7 @@ struct ves1820_config u8 selagc:1; }; -#if defined(CONFIG_DVB_VES1820 ) || defined(CONFIG_DVB_VES1820_MODULE ) +#if defined(CONFIG_DVB_VES1820 ) || (defined(CONFIG_DVB_VES1820_MODULE ) && defined(MODULE ))extern struct dvb_frontend *ves1820_attach (const struct ves1820_config * config,struct i2c_adapter * i2c,u8 pwm);#else
drivers/media/dvb/frontends/ves1x93.h +1 -1
@@ -40,7 +40,7 @@ struct ves1x93_config u8 invert_pwm:1; }; -#if defined(CONFIG_DVB_VES1X93 ) || defined(CONFIG_DVB_VES1X93_MODULE ) +#if defined(CONFIG_DVB_VES1X93 ) || (defined(CONFIG_DVB_VES1X93_MODULE ) && defined(MODULE ))extern struct dvb_frontend *ves1x93_attach (const struct ves1x93_config * config,struct i2c_adapter * i2c);#else
drivers/media/dvb/frontends/zl10353.h +1 -1
@@ -36,7 +36,7 @@ struct zl10353_configint parallel_ts; }; -#if defined(CONFIG_DVB_ZL10353 ) || defined(CONFIG_DVB_ZL10353_MODULE ) +#if defined(CONFIG_DVB_ZL10353 ) || (defined(CONFIG_DVB_ZL10353_MODULE ) && defined(MODULE ))extern struct dvb_frontend *zl10353_attach (const struct zl10353_config *config,struct i2c_adapter *i2c);#else