mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
[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
4 changed files with 5 additions and 10 deletions
|
@ -887,8 +887,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
/* attach demod */
|
||||
adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
|
||||
&anysee_cxd2820r_config, &adap->dev->i2c_adap,
|
||||
NULL);
|
||||
&anysee_cxd2820r_config, &adap->dev->i2c_adap);
|
||||
|
||||
state->has_ci = true;
|
||||
|
||||
|
|
|
@ -77,14 +77,12 @@ struct cxd2820r_config {
|
|||
(defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
|
||||
extern struct dvb_frontend *cxd2820r_attach(
|
||||
const struct cxd2820r_config *config,
|
||||
struct i2c_adapter *i2c,
|
||||
struct dvb_frontend *fe
|
||||
struct i2c_adapter *i2c
|
||||
);
|
||||
#else
|
||||
static inline struct dvb_frontend *cxd2820r_attach(
|
||||
const struct cxd2820r_config *config,
|
||||
struct i2c_adapter *i2c,
|
||||
struct dvb_frontend *fe
|
||||
struct i2c_adapter *i2c
|
||||
)
|
||||
{
|
||||
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 i2c_adapter *i2c,
|
||||
struct dvb_frontend *fe)
|
||||
struct i2c_adapter *i2c)
|
||||
{
|
||||
struct cxd2820r_priv *priv = NULL;
|
||||
int ret;
|
||||
|
|
|
@ -853,8 +853,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
|
|||
case EM28174_BOARD_PCTV_290E:
|
||||
dvb->fe[0] = dvb_attach(cxd2820r_attach,
|
||||
&em28xx_cxd2820r_config,
|
||||
&dev->i2c_adap,
|
||||
NULL);
|
||||
&dev->i2c_adap);
|
||||
if (dvb->fe[0]) {
|
||||
/* FE 0 attach tuner */
|
||||
if (!dvb_attach(tda18271_attach,
|
||||
|
|
Loading…
Reference in a new issue