Commit 6a5bdd32 authored by Jesper Juhl's avatar Jesper Juhl Committed by Mauro Carvalho Chehab

V4L/DVB (3173): [PATCH] Decrease number of pointer derefs in flexcop-fe-tuner.c

- Here's a small patch to decrease the number of pointer derefs in
drivers/media/dvb/b2c2/flexcop-fe-tuner.c
Benefits of the patch:
- Fewer pointer dereferences should make the code slightly faster.
- Size of generated code is smaller
- Improved readability
Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent 4302c15e
...@@ -485,12 +485,16 @@ static struct stv0297_config alps_tdee4_stv0297_config = { ...@@ -485,12 +485,16 @@ static struct stv0297_config alps_tdee4_stv0297_config = {
/* try to figure out the frontend, each card/box can have on of the following list */ /* try to figure out the frontend, each card/box can have on of the following list */
int flexcop_frontend_init(struct flexcop_device *fc) int flexcop_frontend_init(struct flexcop_device *fc)
{ {
struct dvb_frontend_ops *ops;
/* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */ /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) { if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
fc->fe->ops->set_voltage = flexcop_set_voltage; ops = fc->fe->ops;
ops->set_voltage = flexcop_set_voltage;
fc->fe_sleep = fc->fe->ops->sleep; fc->fe_sleep = ops->sleep;
fc->fe->ops->sleep = flexcop_sleep; ops->sleep = flexcop_sleep;
fc->dev_type = FC_SKY; fc->dev_type = FC_SKY;
info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address); info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address);
...@@ -522,15 +526,17 @@ int flexcop_frontend_init(struct flexcop_device *fc) ...@@ -522,15 +526,17 @@ int flexcop_frontend_init(struct flexcop_device *fc)
} else } else
/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) { if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
fc->fe->ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd; ops = fc->fe->ops;
fc->fe->ops->diseqc_send_burst = flexcop_diseqc_send_burst;
fc->fe->ops->set_tone = flexcop_set_tone; ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
fc->fe->ops->set_voltage = flexcop_set_voltage; ops->diseqc_send_burst = flexcop_diseqc_send_burst;
ops->set_tone = flexcop_set_tone;
ops->set_voltage = flexcop_set_voltage;
fc->fe_sleep = fc->fe->ops->sleep; fc->fe_sleep = ops->sleep;
fc->fe->ops->sleep = flexcop_sleep; ops->sleep = flexcop_sleep;
fc->dev_type = FC_SKY_OLD; fc->dev_type = FC_SKY_OLD;
info("found the vp310 (aka mt312) at i2c address: 0x%02x",skystar23_samsung_tbdu18132_config.demod_address); info("found the vp310 (aka mt312) at i2c address: 0x%02x",skystar23_samsung_tbdu18132_config.demod_address);
} }
...@@ -540,8 +546,9 @@ int flexcop_frontend_init(struct flexcop_device *fc) ...@@ -540,8 +546,9 @@ int flexcop_frontend_init(struct flexcop_device *fc)
} else { } else {
if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) { if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
err("frontend registration failed!"); err("frontend registration failed!");
if (fc->fe->ops->release != NULL) ops = fc->fe->ops;
fc->fe->ops->release(fc->fe); if (ops->release != NULL)
ops->release(fc->fe);
fc->fe = NULL; fc->fe = NULL;
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment