Commit 6a4d6a7d authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron
Browse files

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



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: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 100bfa38

drivers/iio/imu/adis.c

+4 −4
Original line number Diff line number Diff line
@@ -277,18 +277,18 @@ int adis_enable_irq(struct adis *adis, bool enable) 
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

 *

 * 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;

	int ret;

	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)

		return ret;
@@ -306,7 +306,7 @@ int adis_check_status(struct adis *adis) 


	return -EIO;

}

EXPORT_SYMBOL_GPL(adis_check_status);

EXPORT_SYMBOL_GPL(__adis_check_status);



/**

 * adis_reset() - Reset the device

include/linux/iio/imu/adis.h

+12 −1
Original line number Diff line number Diff line
@@ -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_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);