[media] cxd2820r: remove unused parameter from cxd2820r_attach
Fix bug introduced by multi-frontend to single-frontend change. This parameter is no longer used after multi-frontend to single-frontend change. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
9bf31efa84
commit
c2bbbe7b5e
|
@ -887,8 +887,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
|
||||||
|
|
||||||
/* attach demod */
|
/* attach demod */
|
||||||
adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
|
adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
|
||||||
&anysee_cxd2820r_config, &adap->dev->i2c_adap,
|
&anysee_cxd2820r_config, &adap->dev->i2c_adap);
|
||||||
NULL);
|
|
||||||
|
|
||||||
state->has_ci = true;
|
state->has_ci = true;
|
||||||
|
|
||||||
|
|
|
@ -77,14 +77,12 @@ struct cxd2820r_config {
|
||||||
(defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
|
(defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
|
||||||
extern struct dvb_frontend *cxd2820r_attach(
|
extern struct dvb_frontend *cxd2820r_attach(
|
||||||
const struct cxd2820r_config *config,
|
const struct cxd2820r_config *config,
|
||||||
struct i2c_adapter *i2c,
|
struct i2c_adapter *i2c
|
||||||
struct dvb_frontend *fe
|
|
||||||
);
|
);
|
||||||
#else
|
#else
|
||||||
static inline struct dvb_frontend *cxd2820r_attach(
|
static inline struct dvb_frontend *cxd2820r_attach(
|
||||||
const struct cxd2820r_config *config,
|
const struct cxd2820r_config *config,
|
||||||
struct i2c_adapter *i2c,
|
struct i2c_adapter *i2c
|
||||||
struct dvb_frontend *fe
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
|
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
|
||||||
|
|
|
@ -604,8 +604,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
|
struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
|
||||||
struct i2c_adapter *i2c,
|
struct i2c_adapter *i2c)
|
||||||
struct dvb_frontend *fe)
|
|
||||||
{
|
{
|
||||||
struct cxd2820r_priv *priv = NULL;
|
struct cxd2820r_priv *priv = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -853,8 +853,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
|
||||||
case EM28174_BOARD_PCTV_290E:
|
case EM28174_BOARD_PCTV_290E:
|
||||||
dvb->fe[0] = dvb_attach(cxd2820r_attach,
|
dvb->fe[0] = dvb_attach(cxd2820r_attach,
|
||||||
&em28xx_cxd2820r_config,
|
&em28xx_cxd2820r_config,
|
||||||
&dev->i2c_adap,
|
&dev->i2c_adap);
|
||||||
NULL);
|
|
||||||
if (dvb->fe[0]) {
|
if (dvb->fe[0]) {
|
||||||
/* FE 0 attach tuner */
|
/* FE 0 attach tuner */
|
||||||
if (!dvb_attach(tda18271_attach,
|
if (!dvb_attach(tda18271_attach,
|
||||||
|
|
Reference in New Issue