Skip to content

L
linux
Commit 19c4ee58 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB: [STV090x] Code simplification 

 - Remove a redundant exported gate control function
Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 20d2c56d
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 30 deletions
drivers/media/dvb/frontends/stv090x.c
View file @ 19c4ee58
...@@ -754,9 +754,8 @@ static int stv090x_write_reg(struct stv090x_state *state, unsigned int reg, u8 d ...@@ -754,9 +754,8 @@ static int stv090x_write_reg(struct stv090x_state *state, unsigned int reg, u8 d
return stv090x_write_regs(state, reg, &data, 1); return stv090x_write_regs(state, reg, &data, 1);
} }
static int stv090x_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) static int stv090x_i2c_gate_ctrl(struct stv090x_state *state, int enable)
{ {
struct stv090x_state *state = fe->demodulator_priv;
u32 reg; u32 reg;
if (enable) if (enable)
...@@ -1778,7 +1777,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1778,7 +1777,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
freq -= cur_step * car_step; freq -= cur_step * car_step;
/* Setup tuner */ /* Setup tuner */
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_set_frequency) { if (state->config->tuner_set_frequency) {
...@@ -1791,12 +1790,12 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1791,12 +1790,12 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
msleep(50); msleep(50);
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_get_status) { if (state->config->tuner_get_status) {
...@@ -1809,7 +1808,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1809,7 +1808,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
else else
dprintk(FE_DEBUG, 1, "Tuner unlocked"); dprintk(FE_DEBUG, 1, "Tuner unlocked");
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
} }
...@@ -1822,7 +1821,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state) ...@@ -1822,7 +1821,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
return srate_coarse; return srate_coarse;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -2167,7 +2166,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd) ...@@ -2167,7 +2166,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
freq -= cur_step * car_step; freq -= cur_step * car_step;
/* Setup tuner */ /* Setup tuner */
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_set_frequency) { if (state->config->tuner_set_frequency) {
...@@ -2180,12 +2179,12 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd) ...@@ -2180,12 +2179,12 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
msleep(50); msleep(50);
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_get_status) { if (state->config->tuner_get_status) {
...@@ -2198,7 +2197,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd) ...@@ -2198,7 +2197,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
else else
dprintk(FE_DEBUG, 1, "Tuner unlocked"); dprintk(FE_DEBUG, 1, "Tuner unlocked");
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c); STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c);
...@@ -2222,7 +2221,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd) ...@@ -2222,7 +2221,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
return lock; return lock;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -2591,7 +2590,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2591,7 +2590,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
} }
state->delsys = stv090x_get_std(state); state->delsys = stv090x_get_std(state);
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_get_frequency) { if (state->config->tuner_get_frequency) {
...@@ -2599,7 +2598,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2599,7 +2598,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
offst_freq = stv090x_get_car_freq(state, state->internal->mclk) / 1000; offst_freq = stv090x_get_car_freq(state, state->internal->mclk) / 1000;
...@@ -2619,7 +2618,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2619,7 +2618,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
if ((state->algo == STV090x_BLIND_SEARCH) || (state->srate < 10000000)) { if ((state->algo == STV090x_BLIND_SEARCH) || (state->srate < 10000000)) {
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_get_frequency) { if (state->config->tuner_get_frequency) {
...@@ -2627,7 +2626,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2627,7 +2626,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
if (abs(offst_freq) <= ((state->search_range / 2000) + 500)) if (abs(offst_freq) <= ((state->search_range / 2000) + 500))
...@@ -2646,7 +2645,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st ...@@ -2646,7 +2645,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
return STV090x_OUTOFRANGE; return STV090x_OUTOFRANGE;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -3000,7 +2999,7 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -3000,7 +2999,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
if (state->algo != STV090x_WARM_SEARCH) { if (state->algo != STV090x_WARM_SEARCH) {
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_set_bandwidth) { if (state->config->tuner_set_bandwidth) {
...@@ -3008,7 +3007,7 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -3008,7 +3007,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
} }
...@@ -3059,7 +3058,7 @@ static int stv090x_optimize_track(struct stv090x_state *state) ...@@ -3059,7 +3058,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
return 0; return 0;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -3235,7 +3234,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3235,7 +3234,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
} }
/* Setup tuner */ /* Setup tuner */
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_set_bbgain) { if (state->config->tuner_set_bbgain) {
...@@ -3256,17 +3255,17 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3256,17 +3255,17 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
msleep(50); msleep(50);
if (state->config->tuner_get_status) { if (state->config->tuner_get_status) {
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (state->config->tuner_get_status(fe, &reg) < 0) if (state->config->tuner_get_status(fe, &reg) < 0)
goto err_gateoff; goto err_gateoff;
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
if (reg) if (reg)
...@@ -3400,7 +3399,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state) ...@@ -3400,7 +3399,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
return signal_state; return signal_state;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -4336,7 +4335,7 @@ static int stv090x_init(struct dvb_frontend *fe) ...@@ -4336,7 +4335,7 @@ static int stv090x_init(struct dvb_frontend *fe)
if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0) if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
goto err; goto err;
if (stv090x_i2c_gate_ctrl(fe, 1) < 0) if (stv090x_i2c_gate_ctrl(state, 1) < 0)
goto err; goto err;
if (config->tuner_set_mode) { if (config->tuner_set_mode) {
...@@ -4349,7 +4348,7 @@ static int stv090x_init(struct dvb_frontend *fe) ...@@ -4349,7 +4348,7 @@ static int stv090x_init(struct dvb_frontend *fe)
goto err_gateoff; goto err_gateoff;
} }
if (stv090x_i2c_gate_ctrl(fe, 0) < 0) if (stv090x_i2c_gate_ctrl(state, 0) < 0)
goto err; goto err;
if (stv090x_set_tspath(state) < 0) if (stv090x_set_tspath(state) < 0)
...@@ -4358,7 +4357,7 @@ static int stv090x_init(struct dvb_frontend *fe) ...@@ -4358,7 +4357,7 @@ static int stv090x_init(struct dvb_frontend *fe)
return 0; return 0;
err_gateoff: err_gateoff:
stv090x_i2c_gate_ctrl(fe, 0); stv090x_i2c_gate_ctrl(state, 0);
err: err:
dprintk(FE_ERROR, 1, "I/O error"); dprintk(FE_ERROR, 1, "I/O error");
return -1; return -1;
...@@ -4503,8 +4502,6 @@ static struct dvb_frontend_ops stv090x_ops = { ...@@ -4503,8 +4502,6 @@ static struct dvb_frontend_ops stv090x_ops = {
.sleep = stv090x_sleep, .sleep = stv090x_sleep,
.get_frontend_algo = stv090x_frontend_algo, .get_frontend_algo = stv090x_frontend_algo,
.i2c_gate_ctrl = stv090x_i2c_gate_ctrl,
.diseqc_send_master_cmd = stv090x_send_diseqc_msg, .diseqc_send_master_cmd = stv090x_send_diseqc_msg,
.diseqc_send_burst = stv090x_send_diseqc_burst, .diseqc_send_burst = stv090x_send_diseqc_burst,
.diseqc_recv_slave_reply = stv090x_recv_slave_reply, .diseqc_recv_slave_reply = stv090x_recv_slave_reply,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7