xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: imu: adis: create an unlocked version of adis_check_status()

Browse Source 
This one also gets re-used in certain operations, so it makes sense to
have an unlocked version of this to group it with other
reads/writes/operations to have a single lock for the whole state change.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Alexandru Ardelean
2019-11-22 15:24:14 +02:00
committed by Jonathan Cameron
parent 100bfa38c8
commit 6a4d6a7d65
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/iio/imu/adis.c
View File

@@ -277,18 +277,18 @@ out_unlock:
EXPORT_SYMBOL(adis_enable_irq); EXPORT_SYMBOL(adis_enable_irq);
/** /**
* adis_check_status() - Check the device for error conditions * __adis_check_status() - Check the device for error conditions (unlocked)
* @adis: The adis device * @adis: The adis device
* *
* Returns 0 on success, a negative error code otherwise * Returns 0 on success, a negative error code otherwise
*/ */
int adis_check_status(struct adis *adis) int __adis_check_status(struct adis *adis)
{ {
uint16_t status; uint16_t status;
int ret; int ret;
int i; int i;
ret = adis_read_reg_16(adis, adis->data->diag_stat_reg, &status); ret = __adis_read_reg_16(adis, adis->data->diag_stat_reg, &status);
if (ret) if (ret)
return ret; return ret;
@@ -306,7 +306,7 @@ int adis_check_status(struct adis *adis)
return -EIO; return -EIO;
} }
EXPORT_SYMBOL_GPL(adis_check_status); EXPORT_SYMBOL_GPL(__adis_check_status);
/** /**
* adis_reset() - Reset the device * adis_reset() - Reset the device

13
include/linux/iio/imu/adis.h
View File

@@ -267,7 +267,18 @@ static inline int adis_read_reg_32(struct adis *adis, unsigned int reg,
} }
int adis_enable_irq(struct adis *adis, bool enable); int adis_enable_irq(struct adis *adis, bool enable);
int adis_check_status(struct adis *adis); int __adis_check_status(struct adis *adis);
static inline int adis_check_status(struct adis *adis)
{
int ret;
mutex_lock(&adis->state_lock);
ret = __adis_check_status(adis);
mutex_unlock(&adis->state_lock);
return ret;
}
int adis_initial_startup(struct adis *adis); int adis_initial_startup(struct adis *adis);