Commit c39c1fd2 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (8531): mxl5007t: move i2c gate handling outside of mutex protected code blocks

There is no reason to protect the i2c gate handling within the mxl5007t
state mutex.

Thanks to Steven Toth for pointing this out.
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 59d27521
...@@ -660,11 +660,11 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status) ...@@ -660,11 +660,11 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
s32 rf_input_level; s32 rf_input_level;
int ret; int ret;
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_synth_lock_status(state, &rf_locked, &ref_locked); ret = mxl5007t_synth_lock_status(state, &rf_locked, &ref_locked);
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
...@@ -676,10 +676,11 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status) ...@@ -676,10 +676,11 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
goto fail; goto fail;
mxl_debug("rf input power: %d", rf_input_level); mxl_debug("rf input power: %d", rf_input_level);
fail: fail:
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
return ret; return ret;
} }
...@@ -730,11 +731,11 @@ static int mxl5007t_set_params(struct dvb_frontend *fe, ...@@ -730,11 +731,11 @@ static int mxl5007t_set_params(struct dvb_frontend *fe,
return -EINVAL; return -EINVAL;
} }
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_tuner_init(state, mode); ret = mxl5007t_tuner_init(state, mode);
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
...@@ -747,10 +748,11 @@ static int mxl5007t_set_params(struct dvb_frontend *fe, ...@@ -747,10 +748,11 @@ static int mxl5007t_set_params(struct dvb_frontend *fe,
state->bandwidth = (fe->ops.info.type == FE_OFDM) ? state->bandwidth = (fe->ops.info.type == FE_OFDM) ?
params->u.ofdm.bandwidth : 0; params->u.ofdm.bandwidth : 0;
fail: fail:
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
return ret; return ret;
} }
...@@ -802,11 +804,11 @@ static int mxl5007t_set_analog_params(struct dvb_frontend *fe, ...@@ -802,11 +804,11 @@ static int mxl5007t_set_analog_params(struct dvb_frontend *fe,
} }
mxl_debug("setting mxl5007 to system %s", mode_name); mxl_debug("setting mxl5007 to system %s", mode_name);
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_tuner_init(state, cable ? cbl_mode : ota_mode); ret = mxl5007t_tuner_init(state, cable ? cbl_mode : ota_mode);
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
...@@ -818,10 +820,11 @@ static int mxl5007t_set_analog_params(struct dvb_frontend *fe, ...@@ -818,10 +820,11 @@ static int mxl5007t_set_analog_params(struct dvb_frontend *fe,
state->frequency = freq; state->frequency = freq;
state->bandwidth = 0; state->bandwidth = 0;
fail: fail:
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
return ret; return ret;
} }
...@@ -833,11 +836,11 @@ static int mxl5007t_init(struct dvb_frontend *fe) ...@@ -833,11 +836,11 @@ static int mxl5007t_init(struct dvb_frontend *fe)
int ret; int ret;
u8 d; u8 d;
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_read_reg(state, 0x05, &d); ret = mxl5007t_read_reg(state, 0x05, &d);
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
...@@ -845,11 +848,11 @@ static int mxl5007t_init(struct dvb_frontend *fe) ...@@ -845,11 +848,11 @@ static int mxl5007t_init(struct dvb_frontend *fe)
ret = mxl5007t_write_reg(state, 0x05, d | 0x01); ret = mxl5007t_write_reg(state, 0x05, d | 0x01);
mxl_fail(ret); mxl_fail(ret);
fail: fail:
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
return ret; return ret;
} }
...@@ -859,11 +862,11 @@ static int mxl5007t_sleep(struct dvb_frontend *fe) ...@@ -859,11 +862,11 @@ static int mxl5007t_sleep(struct dvb_frontend *fe)
int ret; int ret;
u8 d; u8 d;
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_read_reg(state, 0x05, &d); ret = mxl5007t_read_reg(state, 0x05, &d);
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
...@@ -871,11 +874,11 @@ static int mxl5007t_sleep(struct dvb_frontend *fe) ...@@ -871,11 +874,11 @@ static int mxl5007t_sleep(struct dvb_frontend *fe)
ret = mxl5007t_write_reg(state, 0x05, d & ~0x01); ret = mxl5007t_write_reg(state, 0x05, d & ~0x01);
mxl_fail(ret); mxl_fail(ret);
fail: fail:
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
return ret; return ret;
} }
...@@ -995,18 +998,18 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, ...@@ -995,18 +998,18 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
mutex_init(&state->lock); mutex_init(&state->lock);
mutex_lock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
mutex_lock(&state->lock);
ret = mxl5007t_get_chip_id(state); ret = mxl5007t_get_chip_id(state);
mutex_unlock(&state->lock);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
mutex_unlock(&state->lock);
/* check return value of mxl5007t_get_chip_id */ /* check return value of mxl5007t_get_chip_id */
if (mxl_fail(ret)) if (mxl_fail(ret))
goto fail; goto fail;
......
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