github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: light: as73211: Use guard() and move mode switch into inner write_raw fucntion

Browse Source 
By using guard(mutex) and moving code that switches the device to config
mode into _as73211_write_raw() the error flow is simplified.

Cc: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250309170633.1347476-5-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Jonathan Cameron 2025-03-09 17:06:19 +00:00
parent d793d614dc
commit 8dd92667f0
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/iio/light/as73211.c
View File

@ -16,6 +16,7 @@
*/
#include <linux/bitfield.h>
#include <linux/cleanup.h>
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/i2c.h>
@ -517,6 +518,16 @@ static int _as73211_write_raw(struct iio_dev *indio_dev,
struct as73211_data *data = iio_priv(indio_dev);
int ret;
/* Need to switch to config mode ... */
if ((data->osr & AS73211_OSR_DOS_MASK) != AS73211_OSR_DOS_CONFIG) {
data->osr &= ~AS73211_OSR_DOS_MASK;
data->osr |= AS73211_OSR_DOS_CONFIG;
ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR, data->osr);
if (ret < 0)
return ret;
}
switch (mask) {
case IIO_CHAN_INFO_SAMP_FREQ: {
int reg_bits, freq_kHz = val / HZ_PER_KHZ; /* 1024, 2048, ... */
@ -601,28 +612,15 @@ static int as73211_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec con
struct as73211_data *data = iio_priv(indio_dev);
int ret;
mutex_lock(&data->mutex);
guard(mutex)(&data->mutex);
ret = iio_device_claim_direct_mode(indio_dev);
if (ret < 0)
goto error_unlock;
/* Need to switch to config mode ... */
if ((data->osr & AS73211_OSR_DOS_MASK) != AS73211_OSR_DOS_CONFIG) {
data->osr &= ~AS73211_OSR_DOS_MASK;
data->osr |= AS73211_OSR_DOS_CONFIG;
ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR, data->osr);
if (ret < 0)
goto error_release;
}
return ret;
ret = _as73211_write_raw(indio_dev, chan, val, val2, mask);
error_release:
iio_device_release_direct_mode(indio_dev);
error_unlock:
mutex_unlock(&data->mutex);
return ret;
}