From 41ea040c7b6daf05d4884097b0168e7b74c6c0d0 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 5 Oct 2011 15:27:59 +0100 Subject: staging:iio: rename gyro channels to anglvel Ensure naming reflects what is measured, not how it is done. Resolvers can measure the same thing for starters. IIO_GYRO->IIO_ANGL_VEL to ensure consistent naming. Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/gyro/adis16060_core.c | 2 +- drivers/staging/iio/gyro/adis16080_core.c | 2 +- drivers/staging/iio/gyro/adis16130_core.c | 2 +- drivers/staging/iio/gyro/adis16260_core.c | 8 ++++---- drivers/staging/iio/gyro/adxrs450_core.c | 4 ++-- drivers/staging/iio/iio.h | 2 +- drivers/staging/iio/imu/adis16400_core.c | 22 +++++++++++----------- drivers/staging/iio/industrialio-core.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c index f812991..abb6f05 100644 --- a/drivers/staging/iio/gyro/adis16060_core.c +++ b/drivers/staging/iio/gyro/adis16060_core.c @@ -117,7 +117,7 @@ static const struct iio_info adis16060_info = { static const struct iio_chan_spec adis16060_channels[] = { { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .address = ADIS16060_GYRO, diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c index a2ee9be..07b013a 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/staging/iio/gyro/adis16080_core.c @@ -108,7 +108,7 @@ static int adis16080_read_raw(struct iio_dev *indio_dev, static const struct iio_chan_spec adis16080_channels[] = { { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .address = ADIS16080_DIN_GYRO, diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c index a9f270e..87670c0 100644 --- a/drivers/staging/iio/gyro/adis16130_core.c +++ b/drivers/staging/iio/gyro/adis16130_core.c @@ -97,7 +97,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev, static const struct iio_chan_spec adis16130_channels[] = { { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .address = ADIS16130_RATEDATA, diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c index efbee27..dc440d15 100644 --- a/drivers/staging/iio/gyro/adis16260_core.c +++ b/drivers/staging/iio/gyro/adis16260_core.c @@ -390,7 +390,7 @@ enum adis16260_channel { }; #define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \ struct iio_chan_spec adis16260_channels_##axis[] = { \ - IIO_CHAN(IIO_GYRO, 1, 0, 0, NULL, 0, mod, \ + IIO_CHAN(IIO_ANGL_VEL, 1, 0, 0, NULL, 0, mod, \ (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | \ (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) | \ (1 << IIO_CHAN_INFO_SCALE_SEPARATE), \ @@ -468,7 +468,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, case (1 << IIO_CHAN_INFO_SCALE_SEPARATE): case (1 << IIO_CHAN_INFO_SCALE_SHARED): switch (chan->type) { - case IIO_GYRO: + case IIO_ANGL_VEL: *val = 0; if (spi_get_device_id(st->us)->driver_data) *val2 = 320; @@ -495,7 +495,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE): switch (chan->type) { - case IIO_GYRO: + case IIO_ANGL_VEL: bits = 12; break; default: @@ -515,7 +515,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE): switch (chan->type) { - case IIO_GYRO: + case IIO_ANGL_VEL: bits = 12; break; default: diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c index 670b615..1fda3db 100644 --- a/drivers/staging/iio/gyro/adxrs450_core.c +++ b/drivers/staging/iio/gyro/adxrs450_core.c @@ -268,7 +268,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, switch (mask) { case 0: switch (chan->type) { - case IIO_GYRO: + case IIO_ANGL_VEL: ret = adxrs450_spi_sensor_data(indio_dev, &t); if (ret) break; @@ -305,7 +305,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, static const struct iio_chan_spec adxrs450_channels[] = { { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 2a6c673..e7c2865 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h @@ -31,7 +31,7 @@ enum iio_chan_type { IIO_CURRENT, IIO_POWER, IIO_ACCEL, - IIO_GYRO, + IIO_ANGL_VEL, IIO_MAGN, IIO_LIGHT, IIO_INTENSITY, diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c index 07d5a61..365f99a 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/staging/iio/imu/adis16400_core.c @@ -507,7 +507,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, case (1 << IIO_CHAN_INFO_SCALE_SHARED): case (1 << IIO_CHAN_INFO_SCALE_SEPARATE): switch (chan->type) { - case IIO_GYRO: + case IIO_ANGL_VEL: *val = 0; *val2 = st->variant->gyro_scale_micro; return IIO_VAL_INT_PLUS_MICRO; @@ -565,7 +565,7 @@ static struct iio_chan_spec adis16400_channels[] = { .scan_index = ADIS16400_SCAN_SUPPLY, .scan_type = IIO_ST('u', 14, 16, 0) }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_X, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -574,7 +574,7 @@ static struct iio_chan_spec adis16400_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_X, .scan_type = IIO_ST('s', 14, 16, 0) }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Y, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -583,7 +583,7 @@ static struct iio_chan_spec adis16400_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_Y, .scan_type = IIO_ST('s', 14, 16, 0), }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -674,7 +674,7 @@ static struct iio_chan_spec adis16350_channels[] = { .scan_index = ADIS16400_SCAN_SUPPLY, .scan_type = IIO_ST('u', 12, 16, 0) }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_X, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -683,7 +683,7 @@ static struct iio_chan_spec adis16350_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_X, .scan_type = IIO_ST('s', 14, 16, 0) }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Y, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -692,7 +692,7 @@ static struct iio_chan_spec adis16350_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_Y, .scan_type = IIO_ST('s', 14, 16, 0), }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -780,7 +780,7 @@ static struct iio_chan_spec adis16300_channels[] = { .scan_index = ADIS16400_SCAN_SUPPLY, .scan_type = IIO_ST('u', 12, 16, 0) }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_X, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -854,7 +854,7 @@ static struct iio_chan_spec adis16300_channels[] = { static const struct iio_chan_spec adis16334_channels[] = { { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_X, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -863,7 +863,7 @@ static const struct iio_chan_spec adis16334_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_X, .scan_type = IIO_ST('s', 14, 16, 0), }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Y, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | @@ -872,7 +872,7 @@ static const struct iio_chan_spec adis16334_channels[] = { .scan_index = ADIS16400_SCAN_GYRO_Y, .scan_type = IIO_ST('s', 14, 16, 0), }, { - .type = IIO_GYRO, + .type = IIO_ANGL_VEL, .modified = 1, .channel2 = IIO_MOD_Z, .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 647a405..5a6dde8 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -54,7 +54,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_CURRENT] = "current", [IIO_POWER] = "power", [IIO_ACCEL] = "accel", - [IIO_GYRO] = "gyro", + [IIO_ANGL_VEL] = "anglvel", [IIO_MAGN] = "magn", [IIO_LIGHT] = "illuminance", [IIO_INTENSITY] = "intensity", -- cgit v1.1