openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (5132): M920x: more trivial cleanups 

- 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Patrick Boettcher 2006-09-28 13:48:03 -03:00 committed by Mauro Carvalho Chehab
parent 26f48eaa9e
commit 94a47dc433
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/dvb/dvb-usb/m920x.c
View File

@ -138,12 +138,6 @@ static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu
int i; int i;
int ret = 0; 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) if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
return -EAGAIN; return -EAGAIN;
@ -247,9 +241,8 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap)
{ {
deb_rc("megasky_frontend_attach!\n"); 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 0;
}
return -EIO; return -EIO;
} }
@ -474,8 +467,6 @@ static struct dvb_usb_device_properties megasky_properties = {
}}, }},
.i2c_algo = &m9206_i2c_algo, .i2c_algo = &m9206_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
{ "MSI Mega Sky 580 DVB-T USB2.0", { "MSI Mega Sky 580 DVB-T USB2.0",