superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: accel: sca3000: replace error_ret labels by simple returns 

Replace usage of error_ret labels by returning directly when handling
errors. Cases that do a mutex unlock were not changed.

Signed-off-by: Andrew Ijano <andrew.lopes@alumni.usp.br>
Co-developed-by: Gustavo Bastos <gustavobastos@usp.br>
Signed-off-by: Gustavo Bastos <gustavobastos@usp.br>
Suggested-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20250611194648.18133-2-andrew.lopes@alumni.usp.br
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
pull/1279/head
Andrew Ijano 2025-06-11 16:39:19 -03:00 committed by Jonathan Cameron
parent 6f6bf97823
commit a80ad80f1b
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/iio/accel/sca3000.c
View File

@ -369,23 +369,20 @@ static int sca3000_write_ctrl_reg(struct sca3000_state *st,
ret = sca3000_reg_lock_on(st); ret = sca3000_reg_lock_on(st);
if (ret < 0) if (ret < 0)
goto error_ret; return ret;
if (ret) { if (ret) {
ret = __sca3000_unlock_reg_lock(st); ret = __sca3000_unlock_reg_lock(st);
if (ret) if (ret)
goto error_ret; return ret;
} }
/* Set the control select register */ /* Set the control select register */
ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, sel); ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, sel);
if (ret) if (ret)
goto error_ret; return ret;
/* Write the actual value into the register */ /* Write the actual value into the register */
ret = sca3000_write_reg(st, SCA3000_REG_CTRL_DATA_ADDR, val); return sca3000_write_reg(st, SCA3000_REG_CTRL_DATA_ADDR, val);
error_ret:
return ret;
} }
/** /**
@ -402,22 +399,20 @@ static int sca3000_read_ctrl_reg(struct sca3000_state *st,
ret = sca3000_reg_lock_on(st); ret = sca3000_reg_lock_on(st);
if (ret < 0) if (ret < 0)
goto error_ret; return ret;
if (ret) { if (ret) {
ret = __sca3000_unlock_reg_lock(st); ret = __sca3000_unlock_reg_lock(st);
if (ret) if (ret)
goto error_ret; return ret;
} }
/* Set the control select register */ /* Set the control select register */
ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, ctrl_reg); ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, ctrl_reg);
if (ret) if (ret)
goto error_ret; return ret;
ret = sca3000_read_data_short(st, SCA3000_REG_CTRL_DATA_ADDR, 1); ret = sca3000_read_data_short(st, SCA3000_REG_CTRL_DATA_ADDR, 1);
if (ret) if (ret)
goto error_ret;
return st->rx[0];
error_ret:
return ret; return ret;
return st->rx[0];
} }
/** /**
@ -577,7 +572,8 @@ static inline int __sca3000_get_base_freq(struct sca3000_state *st,
ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
if (ret) if (ret)
goto error_ret; return ret;
switch (SCA3000_REG_MODE_MODE_MASK & st->rx[0]) { switch (SCA3000_REG_MODE_MODE_MASK & st->rx[0]) {
case SCA3000_REG_MODE_MEAS_MODE_NORMAL: case SCA3000_REG_MODE_MEAS_MODE_NORMAL:
*base_freq = info->measurement_mode_freq; *base_freq = info->measurement_mode_freq;
@ -591,7 +587,6 @@ static inline int __sca3000_get_base_freq(struct sca3000_state *st,
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
error_ret:
return ret; return ret;
} }
@ -834,7 +829,7 @@ static ssize_t sca3000_read_av_freq(struct device *dev,
val = st->rx[0]; val = st->rx[0];
mutex_unlock(&st->lock); mutex_unlock(&st->lock);
if (ret) if (ret)
goto error_ret; return ret;
switch (val & SCA3000_REG_MODE_MODE_MASK) { switch (val & SCA3000_REG_MODE_MODE_MASK) {
case SCA3000_REG_MODE_MEAS_MODE_NORMAL: case SCA3000_REG_MODE_MEAS_MODE_NORMAL:
@ -857,8 +852,6 @@ static ssize_t sca3000_read_av_freq(struct device *dev,
break; break;
} }
return len; return len;
error_ret:
return ret;
} }
/* /*