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

[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>

authored by

Antti Palosaari and committed by
Mauro Carvalho Chehab
c2bbbe7b 9bf31efa

+5 -10
+1 -2
drivers/media/dvb/dvb-usb/anysee.c
··· 887 887 888 888 /* attach demod */ 889 889 adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, 890 - &anysee_cxd2820r_config, &adap->dev->i2c_adap, 891 - NULL); 890 + &anysee_cxd2820r_config, &adap->dev->i2c_adap); 892 891 893 892 state->has_ci = true; 894 893
+2 -4
drivers/media/dvb/frontends/cxd2820r.h
··· 77 77 (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE)) 78 78 extern struct dvb_frontend *cxd2820r_attach( 79 79 const struct cxd2820r_config *config, 80 - struct i2c_adapter *i2c, 81 - struct dvb_frontend *fe 80 + struct i2c_adapter *i2c 82 81 ); 83 82 #else 84 83 static inline struct dvb_frontend *cxd2820r_attach( 85 84 const struct cxd2820r_config *config, 86 - struct i2c_adapter *i2c, 87 - struct dvb_frontend *fe 85 + struct i2c_adapter *i2c 88 86 ) 89 87 { 90 88 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+1 -2
drivers/media/dvb/frontends/cxd2820r_core.c
··· 604 604 }; 605 605 606 606 struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg, 607 - struct i2c_adapter *i2c, 608 - struct dvb_frontend *fe) 607 + struct i2c_adapter *i2c) 609 608 { 610 609 struct cxd2820r_priv *priv = NULL; 611 610 int ret;
+1 -2
drivers/media/video/em28xx/em28xx-dvb.c
··· 853 853 case EM28174_BOARD_PCTV_290E: 854 854 dvb->fe[0] = dvb_attach(cxd2820r_attach, 855 855 &em28xx_cxd2820r_config, 856 - &dev->i2c_adap, 857 - NULL); 856 + &dev->i2c_adap); 858 857 if (dvb->fe[0]) { 859 858 /* FE 0 attach tuner */ 860 859 if (!dvb_attach(tda18271_attach,