mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 00:29:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

iio: pressure: mpl3115: factor out core of IIO_INFO_RAW read to simplify code flow

Browse Source 
Apply guard(mutex) to remove the need for manual release of the lock.
Factor out the code that occurs under the direct claim.
These two changes allow for direct returns simplifying code flow.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Link: https://patch.msgid.link/20250331121317.1694135-27-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Jonathan Cameron
2025-03-31 13:13:06 +01:00
parent b2a3a51000
commit 770ee1a2c5
1 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
drivers/iio/pressure/mpl3115.c
View File

@@ -69,6 +69,52 @@ static int mpl3115_request(struct mpl3115_data *data)
return 0;
}
static int mpl3115_read_info_raw(struct mpl3115_data *data,
struct iio_chan_spec const *chan, int *val)
{
int ret;
switch (chan->type) {
case IIO_PRESSURE: { /* in 0.25 pascal / LSB */
__be32 tmp = 0;
guard(mutex)(&data->lock);
ret = mpl3115_request(data);
if (ret < 0)
return ret;
ret = i2c_smbus_read_i2c_block_data(data->client,
MPL3115_OUT_PRESS,
3, (u8 *) &tmp);
if (ret < 0)
return ret;
*val = be32_to_cpu(tmp) >> chan->scan_type.shift;
return IIO_VAL_INT;
}
case IIO_TEMP: { /* in 0.0625 celsius / LSB */
__be16 tmp;
guard(mutex)(&data->lock);
ret = mpl3115_request(data);
if (ret < 0)
return ret;
ret = i2c_smbus_read_i2c_block_data(data->client,
MPL3115_OUT_TEMP,
2, (u8 *) &tmp);
if (ret < 0)
return ret;
*val = sign_extend32(be16_to_cpu(tmp) >> chan->scan_type.shift,
chan->scan_type.realbits - 1);
return IIO_VAL_INT;
}
default:
return -EINVAL;
}
}
static int mpl3115_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long mask)
@@ -82,49 +128,7 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,
if (ret)
return ret;
switch (chan->type) {
case IIO_PRESSURE: { /* in 0.25 pascal / LSB */
__be32 tmp = 0;
mutex_lock(&data->lock);
ret = mpl3115_request(data);
if (ret < 0) {
mutex_unlock(&data->lock);
break;
}
ret = i2c_smbus_read_i2c_block_data(data->client,
MPL3115_OUT_PRESS, 3, (u8 *) &tmp);
mutex_unlock(&data->lock);
if (ret < 0)
break;
*val = be32_to_cpu(tmp) >> chan->scan_type.shift;
ret = IIO_VAL_INT;
break;
}
case IIO_TEMP: { /* in 0.0625 celsius / LSB */
__be16 tmp;
mutex_lock(&data->lock);
ret = mpl3115_request(data);
if (ret < 0) {
mutex_unlock(&data->lock);
break;
}
ret = i2c_smbus_read_i2c_block_data(data->client,
MPL3115_OUT_TEMP, 2, (u8 *) &tmp);
mutex_unlock(&data->lock);
if (ret < 0)
break;
*val = sign_extend32(be16_to_cpu(tmp) >> chan->scan_type.shift,
chan->scan_type.realbits - 1);
ret = IIO_VAL_INT;
break;
}
default:
ret = -EINVAL;
break;
}
ret = mpl3115_read_info_raw(data, chan, val);
iio_device_release_direct_mode(indio_dev);
return ret;