Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c6d64b authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio:adis16400: Code style cleanup 



Do a set of minor miscellaneous code style cleanups for the adis16400 before
moving it out of staging. Delete outdated comments, removed excess whitespace,
add missing whitespace, replace u{8,16} with uint{8,16}_t.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 6634ccae

drivers/staging/iio/imu/adis16400_core.c

+37 −44
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ enum adis16400_chip_variant { 
static int adis16334_get_freq(struct adis16400_state *st)

static int adis16334_get_freq(struct adis16400_state *st)

{

{

	int ret;

	int ret;

	u16 t;

	uint16_t t;





	ret = adis_read_reg_16(&st->adis, ADIS16400_SMPL_PRD, &t);

	ret = adis_read_reg_16(&st->adis, ADIS16400_SMPL_PRD, &t);

	if (ret < 0)

	if (ret < 0)
@@ -78,11 +78,12 @@ static int adis16334_set_freq(struct adis16400_state *st, unsigned int freq) 
static int adis16400_get_freq(struct adis16400_state *st)

static int adis16400_get_freq(struct adis16400_state *st)

{

{

	int sps, ret;

	int sps, ret;

	u16 t;

	uint16_t t;





	ret = adis_read_reg_16(&st->adis, ADIS16400_SMPL_PRD, &t);

	ret = adis_read_reg_16(&st->adis, ADIS16400_SMPL_PRD, &t);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;



	sps = (t & ADIS16400_SMPL_PRD_TIME_BASE) ? 53 : 1638;

	sps = (t & ADIS16400_SMPL_PRD_TIME_BASE) ? 53 : 1638;

	sps /= (t & ADIS16400_SMPL_PRD_DIV_MASK) + 1;

	sps /= (t & ADIS16400_SMPL_PRD_DIV_MASK) + 1;
@@ -97,6 +98,7 @@ static int adis16400_set_freq(struct adis16400_state *st, unsigned int freq) 
	if (t > 0)

	if (t > 0)

		t--;

		t--;

	t &= ADIS16400_SMPL_PRD_DIV_MASK;

	t &= ADIS16400_SMPL_PRD_DIV_MASK;



	if ((t & ADIS16400_SMPL_PRD_DIV_MASK) >= 0x0A)

	if ((t & ADIS16400_SMPL_PRD_DIV_MASK) >= 0x0A)

		st->adis.spi->max_speed_hz = ADIS16400_SPI_SLOW;

		st->adis.spi->max_speed_hz = ADIS16400_SPI_SLOW;

	else

	else
@@ -111,13 +113,13 @@ static ssize_t adis16400_read_frequency(struct device *dev, 
{

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	int ret, len = 0;

	int ret;





	ret = st->variant->get_freq(st);

	ret = st->variant->get_freq(st);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;

	len = sprintf(buf, "%d\n", ret);



	return len;

	return sprintf(buf, "%d\n", ret);

}

}





static const unsigned adis16400_3db_divisors[] = {

static const unsigned adis16400_3db_divisors[] = {
@@ -134,8 +136,8 @@ static const unsigned adis16400_3db_divisors[] = { 
static int adis16400_set_filter(struct iio_dev *indio_dev, int sps, int val)

static int adis16400_set_filter(struct iio_dev *indio_dev, int sps, int val)

{

{

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	uint16_t val16;

	int i, ret;

	int i, ret;

	u16 val16;





	for (i = ARRAY_SIZE(adis16400_3db_divisors) - 1; i >= 1; i--) {

	for (i = ARRAY_SIZE(adis16400_3db_divisors) - 1; i >= 1; i--) {

		if (sps / adis16400_3db_divisors[i] >= val)

		if (sps / adis16400_3db_divisors[i] >= val)
@@ -152,26 +154,22 @@ static int adis16400_set_filter(struct iio_dev *indio_dev, int sps, int val) 
}

}





static ssize_t adis16400_write_frequency(struct device *dev,

static ssize_t adis16400_write_frequency(struct device *dev,

		struct device_attribute *attr,

	struct device_attribute *attr, const char *buf, size_t len)

		const char *buf,

		size_t len)

{

{

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	long val;

	long val;

	int ret;

	int ret;





	ret = strict_strtol(buf, 10, &val);

	ret = kstrtol(buf, 10, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;



	if (val == 0)

	if (val == 0)

		return -EINVAL;

		return -EINVAL;





	mutex_lock(&indio_dev->mlock);

	mutex_lock(&indio_dev->mlock);



	st->variant->set_freq(st, val);

	st->variant->set_freq(st, val);



	/* Also update the filter */

	mutex_unlock(&indio_dev->mlock);

	mutex_unlock(&indio_dev->mlock);





	return ret ? ret : len;

	return ret ? ret : len;
@@ -182,9 +180,9 @@ static int adis16400_stop_device(struct iio_dev *indio_dev) 
{

{

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	int ret;

	int ret;

	u16 val = ADIS16400_SLP_CNT_POWER_OFF;





	ret = adis_write_reg_16(&st->adis, ADIS16400_SLP_CNT, val);

	ret = adis_write_reg_16(&st->adis, ADIS16400_SLP_CNT,

			ADIS16400_SLP_CNT_POWER_OFF);

	if (ret)

	if (ret)

		dev_err(&indio_dev->dev,

		dev_err(&indio_dev->dev,

			"problem with turning device off: SLP_CNT");

			"problem with turning device off: SLP_CNT");
@@ -194,10 +192,10 @@ static int adis16400_stop_device(struct iio_dev *indio_dev) 




static int adis16400_initial_setup(struct iio_dev *indio_dev)

static int adis16400_initial_setup(struct iio_dev *indio_dev)

{

{

	int ret;

	u16 prod_id, smp_prd;

	unsigned int device_id;

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	uint16_t prod_id, smp_prd;

	unsigned int device_id;

	int ret;





	/* use low spi speed for init if the device has a slow mode */

	/* use low spi speed for init if the device has a slow mode */

	if (st->variant->flags & ADIS16400_HAS_SLOW_MODE)

	if (st->variant->flags & ADIS16400_HAS_SLOW_MODE)
@@ -247,7 +245,7 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO, 
			      adis16400_read_frequency,

			      adis16400_read_frequency,

			      adis16400_write_frequency);

			      adis16400_write_frequency);





static const u8 adis16400_addresses[] = {

static const uint8_t adis16400_addresses[] = {

	[ADIS16400_SCAN_GYRO_X] = ADIS16400_XGYRO_OFF,

	[ADIS16400_SCAN_GYRO_X] = ADIS16400_XGYRO_OFF,

	[ADIS16400_SCAN_GYRO_Y] = ADIS16400_YGYRO_OFF,

	[ADIS16400_SCAN_GYRO_Y] = ADIS16400_YGYRO_OFF,

	[ADIS16400_SCAN_GYRO_Z] = ADIS16400_ZGYRO_OFF,

	[ADIS16400_SCAN_GYRO_Z] = ADIS16400_ZGYRO_OFF,
@@ -257,15 +255,12 @@ static const u8 adis16400_addresses[] = { 
};

};





static int adis16400_write_raw(struct iio_dev *indio_dev,

static int adis16400_write_raw(struct iio_dev *indio_dev,

			       struct iio_chan_spec const *chan,

	struct iio_chan_spec const *chan, int val, int val2, long info)

			       int val,

			       int val2,

			       long mask)

{

{

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	int ret, sps;

	int ret, sps;





	switch (mask) {

	switch (info) {

	case IIO_CHAN_INFO_CALIBBIAS:

	case IIO_CHAN_INFO_CALIBBIAS:

		mutex_lock(&indio_dev->mlock);

		mutex_lock(&indio_dev->mlock);

		ret = adis_write_reg_16(&st->adis,

		ret = adis_write_reg_16(&st->adis,
@@ -273,8 +268,10 @@ static int adis16400_write_raw(struct iio_dev *indio_dev, 
		mutex_unlock(&indio_dev->mlock);

		mutex_unlock(&indio_dev->mlock);

		return ret;

		return ret;

	case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:

	case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:

		/* Need to cache values so we can update if the frequency

		/*

		   changes */

		 * Need to cache values so we can update if the frequency

		 * changes.

		 */

		mutex_lock(&indio_dev->mlock);

		mutex_lock(&indio_dev->mlock);

		st->filt_int = val;

		st->filt_int = val;

		/* Work out update to current value */

		/* Work out update to current value */
@@ -293,16 +290,13 @@ static int adis16400_write_raw(struct iio_dev *indio_dev, 
}

}





static int adis16400_read_raw(struct iio_dev *indio_dev,

static int adis16400_read_raw(struct iio_dev *indio_dev,

			      struct iio_chan_spec const *chan,

	struct iio_chan_spec const *chan, int *val, int *val2, long info)

			      int *val,

			      int *val2,

			      long mask)

{

{

	struct adis16400_state *st = iio_priv(indio_dev);

	struct adis16400_state *st = iio_priv(indio_dev);

	int16_t val16;

	int ret;

	int ret;

	s16 val16;





	switch (mask) {

	switch (info) {

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_RAW:

		return adis_single_conversion(indio_dev, chan, 0, val);

		return adis_single_conversion(indio_dev, chan, 0, val);

	case IIO_CHAN_INFO_SCALE:

	case IIO_CHAN_INFO_SCALE:
@@ -721,13 +715,14 @@ static const struct adis_data adis16400_data = { 




static int adis16400_probe(struct spi_device *spi)

static int adis16400_probe(struct spi_device *spi)

{

{

	int ret;

	struct adis16400_state *st;

	struct adis16400_state *st;

	struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));

	struct iio_dev *indio_dev;

	if (indio_dev == NULL) {

	int ret;

		ret =  -ENOMEM;



		goto error_ret;

	indio_dev = iio_device_alloc(sizeof(*st));

	}

	if (indio_dev == NULL)

		return -ENOMEM;



	st = iio_priv(indio_dev);

	st = iio_priv(indio_dev);

	/* this is only used for removal purposes */

	/* this is only used for removal purposes */

	spi_set_drvdata(spi, indio_dev);

	spi_set_drvdata(spi, indio_dev);
@@ -767,11 +762,9 @@ static int adis16400_probe(struct spi_device *spi) 
	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);

	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);

error_free_dev:

error_free_dev:

	iio_device_free(indio_dev);

	iio_device_free(indio_dev);

error_ret:

	return ret;

	return ret;

}

}





/* fixme, confirm ordering in this function */

static int adis16400_remove(struct spi_device *spi)

static int adis16400_remove(struct spi_device *spi)

{

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct iio_dev *indio_dev = spi_get_drvdata(spi);