diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-28 12:48:03 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-28 12:48:03 -0400 |
| commit | c40096038d501a3afa1722d4290477ae37557964 (patch) | |
| tree | 070a3e76db63c9374f7297b438bb9ccfb53d6f2d /linux/drivers/media/dvb/dvb-usb/m920x.c | |
| parent | 6640030077783c0cfa63707b7834cadbc2a752ec (diff) | |
| download | mediapointer-dvb-s2-c40096038d501a3afa1722d4290477ae37557964.tar.gz mediapointer-dvb-s2-c40096038d501a3afa1722d4290477ae37557964.tar.bz2 | |
m920x: more trivial cleanups
From: Patrick Boettcher <patrick.boettcher@desy.de>
- Removed some needless brances
- Removed an unneeded check for adapter[0]
- Removed unneeded declaration of .generic_bulk_ctrl_endpoint = 0x01
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/m920x.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/m920x.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/m920x.c b/linux/drivers/media/dvb/dvb-usb/m920x.c index a7d42934d..6fc71843b 100644 --- a/linux/drivers/media/dvb/dvb-usb/m920x.c +++ b/linux/drivers/media/dvb/dvb-usb/m920x.c @@ -145,12 +145,6 @@ static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu int i; int ret = 0; - /* Need to access d->adapter[0] */ - if (d->num_adapters_initialized != 1) { - deb_rc("Impossible happened!\n"); - return -EINVAL; - } - if (mutex_lock_interruptible(&d->i2c_mutex) < 0) return -EAGAIN; @@ -254,9 +248,8 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap) { deb_rc("megasky_frontend_attach!\n"); - if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) != NULL) { + if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) != NULL) return 0; - } return -EIO; } @@ -481,8 +474,6 @@ static struct dvb_usb_device_properties megasky_properties = { }}, .i2c_algo = &m9206_i2c_algo, - .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 1, .devices = { { "MSI Mega Sky 580 DVB-T USB2.0", |