diff options
author | Antti Palosaari <crope@iki.fi> | 2012-01-19 12:46:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 15:10:36 -0500 |
commit | c2bbbe7b5e79974c5ed1c828690731f6f5106bee (patch) | |
tree | ac6792aa934232f11d0da72f2c87f71134f066e3 /drivers/media/dvb | |
parent | 9bf31efa84c898a0cf294bacdfe8edcac24e6318 (diff) |
[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>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/anysee.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/cxd2820r.h | 6 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/cxd2820r_core.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c index ecc3addc77ec..7b77c7b29f65 100644 --- a/drivers/media/dvb/dvb-usb/anysee.c +++ b/drivers/media/dvb/dvb-usb/anysee.c | |||
@@ -887,8 +887,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) | |||
887 | 887 | ||
888 | /* attach demod */ | 888 | /* attach demod */ |
889 | adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, | 889 | adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, |
890 | &anysee_cxd2820r_config, &adap->dev->i2c_adap, | 890 | &anysee_cxd2820r_config, &adap->dev->i2c_adap); |
891 | NULL); | ||
892 | 891 | ||
893 | state->has_ci = true; | 892 | state->has_ci = true; |
894 | 893 | ||
diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb/frontends/cxd2820r.h index cf0f546aa1d1..5aa306ebb7ef 100644 --- a/drivers/media/dvb/frontends/cxd2820r.h +++ b/drivers/media/dvb/frontends/cxd2820r.h | |||
@@ -77,14 +77,12 @@ struct cxd2820r_config { | |||
77 | (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE)) | 77 | (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE)) |
78 | extern struct dvb_frontend *cxd2820r_attach( | 78 | extern struct dvb_frontend *cxd2820r_attach( |
79 | const struct cxd2820r_config *config, | 79 | const struct cxd2820r_config *config, |
80 | struct i2c_adapter *i2c, | 80 | struct i2c_adapter *i2c |
81 | struct dvb_frontend *fe | ||
82 | ); | 81 | ); |
83 | #else | 82 | #else |
84 | static inline struct dvb_frontend *cxd2820r_attach( | 83 | static inline struct dvb_frontend *cxd2820r_attach( |
85 | const struct cxd2820r_config *config, | 84 | const struct cxd2820r_config *config, |
86 | struct i2c_adapter *i2c, | 85 | struct i2c_adapter *i2c |
87 | struct dvb_frontend *fe | ||
88 | ) | 86 | ) |
89 | { | 87 | { |
90 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | 88 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); |
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c index 5fe591d226f5..bdfa207a883e 100644 --- a/drivers/media/dvb/frontends/cxd2820r_core.c +++ b/drivers/media/dvb/frontends/cxd2820r_core.c | |||
@@ -604,8 +604,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = { | |||
604 | }; | 604 | }; |
605 | 605 | ||
606 | struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg, | 606 | struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg, |
607 | struct i2c_adapter *i2c, | 607 | struct i2c_adapter *i2c) |
608 | struct dvb_frontend *fe) | ||
609 | { | 608 | { |
610 | struct cxd2820r_priv *priv = NULL; | 609 | struct cxd2820r_priv *priv = NULL; |
611 | int ret; | 610 | int ret; |